Development: Update SDK and build dependencies

Author: krusche

.github/workflows/e2e-test.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   end-to-end-tests:
     name: End To End Tests
-    runs-on: [self-hosted, ase-large-android-sdk-34]
+    runs-on: [self-hosted, ase-large-android-sdk-35]
     timeout-minutes: 60
 
     steps:

.github/workflows/unit-test.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   jUnit:
     name: JUnit Tests
-    runs-on: [self-hosted, ase-large-android-sdk-34]
+    runs-on: [self-hosted, ase-large-android-sdk-35]
     timeout-minutes: 60
 
     steps:
@@ -41,4 +41,4 @@ jobs:
           name: Android Unit Tests
           path: test-outputs/**/*.xml
           reporter: java-junit
-          fail-on-empty: 'false'
+          fail-on-empty: 'false'

app/build.gradle.kts

@@ -3,7 +3,6 @@
 import com.google.firebase.appdistribution.gradle.firebaseAppDistribution
 import java.io.FileInputStream
 import java.util.Properties
-import java.lang.Boolean as JavaBoolean
 
 // https://developer.android.com/studio/publish/app-signing#secure-shared-keystore
 val keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -24,7 +23,7 @@ plugins {
 android {
     namespace = "de.tum.informatics.www1.artemis.native_app.android"
 
-    val versionName = "0.9.0"
+    val versionName = "1.0.0"
     val versionCode =
         if (!System.getenv("bamboo_buildNumber")
                 .isNullOrEmpty()

build-logic/convention/src/main/kotlin/commonConfiguration/AndroidCompose.kt

@@ -6,7 +6,7 @@ import org.gradle.kotlin.dsl.getByType
 
 //Adapted from: https://github.com/android/nowinandroid/blob/bbc5460b624d67b64b5b5118f8a0e1763427e7e4/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
 
-internal fun Project.configureCompose(commonExtension: CommonExtension<*, *, *, *, *>) {
+internal fun Project.configureCompose(commonExtension: CommonExtension<*, *, *, *, *, *>) {
     val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
     commonExtension.apply {
@@ -43,4 +43,4 @@ internal fun Project.configureCompose(commonExtension: CommonExtension<*, *, *,
             add("testImplementation", "androidx.compose.ui:ui-test-manifest")
         }
     }
-}
+}

build-logic/convention/src/main/kotlin/commonConfiguration/KotlinAndroid.kt

@@ -54,7 +54,7 @@ object ProductFlavors {
  * Configure base Kotlin with Android options
  */
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
@@ -112,7 +112,7 @@ internal fun Project.configureKotlinAndroid(
 }
 
 internal fun Project.configureReleaseTypeFlavors(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         flavorDimensions += ProductFlavors.Dimensions.ReleaseType.Key
@@ -136,7 +136,7 @@ internal fun Project.configureReleaseTypeFlavors(
 }
 
 internal fun Project.configureInstanceSelectionFlavors(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         flavorDimensions += ProductFlavors.Dimensions.InstanceSelection.Key
@@ -191,6 +191,6 @@ private fun NamedDomainObjectContainer<out ProductFlavor>.createFlavor(
     }
 }
 
-fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
     (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }

build.gradle.kts

@@ -21,5 +21,5 @@ plugins {
 }
 
 tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
-}
+    delete(rootProject.layout.buildDirectory)
+}

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-compileSdk = "34"
-targetSdk = "33"
-minSdk = "30"
-buildToolsVersion = "34.0.0"
+compileSdk = "35"
+targetSdk = "34"
+minSdk = "31"
+buildToolsVersion = "35.0.0"
 
 accompanist = "0.30.1"
 androidDesugarJdkLibs = "2.0.4"
@@ -11,13 +11,13 @@ androidxAppCompat = "1.6.1"
 androidxComposeBom = "2023.10.01"
 androidxLifecycle = "2.6.2"
 androidxNavigation = "2.7.5"
-androidGradlePlugin = "8.1.4"
+androidGradlePlugin = "8.7.0"
 androidxDataStore = "1.0.0"
 androidxPaging = "3.2.1"
 androidxPagingCompose = "3.2.1"
 coil = "2.4.0"
 emoji2 = "1.4.0"
-kotlin = "1.9.22"
+kotlin = "1.9.25"
 kotlinxCoroutines = "1.7.3"
 kotlinxDatetime = "0.4.0"
 kotlinxSerializationJson = "1.5.1"
@@ -35,8 +35,8 @@ sentry-android = "6.22.0"
 work = "2.9.0"
 
 # Used indirecly in the build config -> Do not remove without double checking.
-androidxComposeCompiler = "1.5.4"
-androidxCore = "1.12.0"
+androidxComposeCompiler = "1.5.15"
+androidxCore = "1.13.1"
 
 [libraries]
 accompanist-placeholder-material = { group = "com.google.accompanist", name = "accompanist-placeholder-material", version.ref = "accompanist" }
@@ -122,7 +122,7 @@ noties-markwon-image-coil = { group = "io.noties.markwon", name = "image-coil",
 oss-licenses-plugin = { module = "com.google.android.gms:oss-licenses-plugin", version.ref = "ossLicensesPlugin" }
 placeholder-material = { group = "io.github.fornewid", name = "placeholder-material3", version.ref = "placeholderMaterial" }
 play-services-oss-licences = { group = "com.google.android.gms", name = "play-services-oss-licenses", version = "17.0.1" }
-robolectric = { group = "org.robolectric", name = "robolectric", version = "4.10.3" }
+robolectric = { group = "org.robolectric", name = "robolectric", version = "4.13" }
 sentry-android = { group = "io.sentry", name = "sentry-android", version.ref = "sentry-android" }
 sentry-compose-android = { group = "io.sentry", name = "sentry-compose-android", version.ref = "sentry-android" }
 toolbar-compose = { group = "me.onebone", name = "toolbar-compose", version = "2.3.5" }
@@ -139,4 +139,4 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 google-services = { id = "com.google.gms.google-services", version = "4.4.0" }
 google-firebase-appdistribution = { id = "com.google.firebase.appdistribution", version = "4.0.1" }
 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
-google-ksp = { id = "com.google.devtools.ksp", version = "1.9.20-1.0.14" }
+google-ksp = { id = "com.google.devtools.ksp", version = "1.9.25-1.0.20" }

readme.md

@@ -35,6 +35,8 @@ The following libraries and tools are utilized:
 To run this project, you need a recent version of [Android Studio](https://developer.android.com/studio) or IntelliJ (not guaranteed to work) and the AndroidSDK installed.
 If you want to run the end-to-end tests, you will also need [docker](https://www.docker.com/). 
 
+Alternative, you can install the Android SDK as described here: https://benshapi.ro/post/android-sdk-without-android-studio
+
 ## Build flavors
 This project is configured to support multiple [flavor dimensions](https://developer.android.com/build/build-variants):
 - TUM or unrestricted: For TUM builds, users are forced to connect to the [TUM Artemis instance](https://artemis.cit.tum.de).
@@ -53,4 +55,4 @@ in AndroidStudio and select copy-image.
 By building the dockerfile or using its derived images, you accept the terms in the following license agreements:
 * [Android Software Development Kit License Agreement](https://raw.githubusercontent.com/thyrlian/AndroidSDK/master/EULA/AndroidSoftwareDevelopmentKitLicenseAgreement-20190116) (or read it [here](https://developer.android.com/studio/terms.html))
 * [Android SDK Preview License Agreement](https://raw.githubusercontent.com/thyrlian/AndroidSDK/master/EULA/AndroidSDKPreviewLicenseAgreement)
-* [Intel Android Extra License](https://raw.githubusercontent.com/thyrlian/AndroidSDK/master/EULA/IntelAndroidExtraLicense)
+* [Intel Android Extra License](https://raw.githubusercontent.com/thyrlian/AndroidSDK/master/EULA/IntelAndroidExtraLicense)