♻️ Various: remove non-essential components and upgrade all dependencies

.github/workflows/ci.yml

@@ -24,23 +24,23 @@ jobs:
           echo "S3_CI_OBJECT_PATH=ci/integration-test-app-$GITHUB_RUN_NUMBER.apk" >> $GITHUB_ENV
           echo "S3_LATEST_OBJECT_PATH=dev/integration-test-app.apk" >> $GITHUB_ENV
 
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: '11'
+          java-version: '21'
 
       - uses: actions/checkout@v2
       - name: Get tags for versioning the app
         run: git fetch --tags -f
 
       - name: Lint and test
-        run: ./gradlew ktlintCheck ktlintTestSourceSetCheck ktlintAndroidTestSourceSetCheck lintRelease --stacktrace
+        run: ./gradlew lintRelease test --stacktrace
 
       - name: Publish reports
         uses: actions/upload-artifact@v1
         with:
           name: test-reports
-          path: app/build/reports
+          path: integration-test-app/build/reports
 
       - name: Build APK
         run: |

build.gradle.kts

@@ -23,6 +23,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        mavenLocal()
     }
 }
 

buildSrc/build.gradle.kts

@@ -9,3 +9,17 @@ repositories {
     mavenCentral()
     maven("https://plugins.gradle.org/m2/")
 }
+
+tasks {
+    compileKotlin {
+        kotlinOptions {
+            jvmTarget = "11"
+        }
+    }
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}

buildSrc/src/main/kotlin/Dependencies.kt

@@ -1,17 +1,16 @@
 object Apps {
     const val testApplicationId = "com.eidu.integration.test.app"
-    const val compileSdk = 31
+    const val compileSdk = 34
     const val minSdk = 21
-    const val targetSdk = 31
-    const val buildToolsVersion = "30.0.3"
+    const val targetSdk = 34
+    const val buildToolsVersion = "34.0.0"
 }
 
 object Versions {
-    const val androidGradle = "7.3.1"
-    const val kotlin = "1.7.0"
-    const val compose = "1.1.1"
-    const val objectBox = "3.2.0"
-    const val navigation = "2.5.0"
-    const val ktlintGradle = "10.3.0"
-    const val hilt = "2.42"
+    const val androidGradle = "8.2.2"
+    const val kotlin = "1.9.22"
+    const val compose = "1.6.2"
+    const val objectBox = "3.8.0"
+    const val navigation = "2.7.7"
+    const val hilt = "2.51"
 }

git-hooks/pre-push

@@ -1 +1 @@
-./gradlew ktlintCheck ktlintTestSourceSetCheck ktlintAndroidTestSourceSetCheck lintDebug
+./gradlew lintDebug test

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Sep 02 15:33:24 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

integration-test-app/build.gradle.kts

@@ -8,8 +8,7 @@ plugins {
     id("kotlin-kapt")
     id("io.objectbox")
     id("dagger.hilt.android.plugin")
-    id("org.jlleitschuh.gradle.ktlint") version Versions.ktlintGradle
-    kotlin("plugin.serialization") version "1.7.0"
+    kotlin("plugin.serialization") version "1.9.22"
 }
 
 val version = getAppVersion()
@@ -65,27 +64,22 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.2.0"
+        kotlinCompilerExtensionVersion = "1.5.10"
     }
-    packagingOptions {
+    packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
 }
 
-repositories {
-    google()
-    mavenCentral()
-}
-
 dependencies {
-    implementation("androidx.core:core-ktx:1.8.0")
-    implementation("androidx.appcompat:appcompat:1.4.2")
-    implementation("com.google.android.material:material:1.6.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0")
+    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.11.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
 
     // Compose
     implementation("androidx.compose.ui:ui:${Versions.compose}")
@@ -95,20 +89,13 @@ dependencies {
     implementation("androidx.compose.runtime:runtime-livedata:${Versions.compose}")
     implementation("androidx.navigation:navigation-compose:${Versions.navigation}")
     implementation("androidx.compose.material:material-icons-extended:${Versions.compose}")
-    implementation("androidx.activity:activity-compose:1.5.0")
+    implementation("androidx.activity:activity-compose:1.8.2")
 
     // Hilt/Dagger DI
     implementation("com.google.dagger:hilt-android:${Versions.hilt}")
     kapt("com.google.dagger:hilt-android-compiler:${Versions.hilt}")
 
     // EIDU dependencies
     implementation("com.eidu:integration-library:1.8.0")
-    implementation("com.eidu:learning-packages:1.0.7")
-
-    // Test
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.3")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:${Versions.compose}")
-    debugImplementation("androidx.compose.ui:ui-tooling:${Versions.compose}")
+    implementation("com.eidu:learning-packages:2.0.0")
 }

integration-test-app/src/main/java/com/eidu/integration/test/app/ui/screens/LearningAppsScreen.kt

@@ -52,7 +52,7 @@ import com.eidu.integration.test.app.ui.viewmodel.Result
 @Composable
 fun LearningAppsScreen(
     learningApps: List<LearningApp>,
-    importStatus: LiveData<Result<Unit>>,
+    importStatus: LiveData<Result<Unit>?>,
     dismissStatus: () -> Unit,
     navigateToUnits: (app: LearningApp) -> Unit,
     deleteLearningApp: (app: LearningApp) -> Unit,