Update Dependencies (#209)

Signed-off-by: Aditya Wasan <adityawasan55@gmail.com>
Skrilltrax · Oct 27, 2023 · 350e4b9 · 350e4b9
1 parent 53006f0
commit 350e4b9
Show file tree

Hide file tree

Showing 19 changed files with 97 additions and 74 deletions.
diff --git a/.github/workflows/android_pr.yml b/.github/workflows/android_pr.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '19'
           cache: 'gradle'
 
       - name: Check codestyle
@@ -39,7 +39,7 @@ jobs:
         uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '19'
           cache: 'gradle'
 
       - name: Run unit tests
@@ -66,7 +66,7 @@ jobs:
         uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '19'
           cache: 'gradle'
 
       - name: Build debug APKs
@@ -86,7 +86,7 @@ jobs:
         uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '19'
           cache: 'gradle'
 
       - name: Run Lint on debug variants
@@ -106,7 +106,7 @@ jobs:
         uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '19'
           cache: 'gradle'
 
       - name: Generate coverage reports with kotlinx-kover

diff --git a/.github/workflows/android_push.yml b/.github/workflows/android_push.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '19'
           cache: 'gradle'
 
       - name: Check codestyle
@@ -39,7 +39,7 @@ jobs:
         uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '19'
           cache: 'gradle'
 
       - name: Run unit tests
@@ -66,7 +66,7 @@ jobs:
         uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '19'
           cache: 'gradle'
 
       - name: Build debug APKs
@@ -86,7 +86,7 @@ jobs:
         uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '19'
           cache: 'gradle'
 
       - name: Run Lint on debug variants
@@ -106,7 +106,7 @@ jobs:
         uses: actions/setup-java@v3.12.0
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '19'
           cache: 'gradle'
 
       - name: Generate coverage reports with kotlinx-kover

diff --git a/build-logic/android-plugins/build.gradle.kts b/build-logic/android-plugins/build.gradle.kts
@@ -7,13 +7,16 @@ plugins { `kotlin-dsl` }
 
 afterEvaluate {
   tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = JavaVersion.VERSION_11.toString()
-    targetCompatibility = JavaVersion.VERSION_11.toString()
+    sourceCompatibility = JavaVersion.VERSION_19.toString()
+    targetCompatibility = JavaVersion.VERSION_19.toString()
   }
 
   tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
+    kotlinOptions { jvmTarget = JavaVersion.VERSION_19.toString() }
   }
 }
 
-dependencies { implementation(libs.build.agp) }
+dependencies {
+  implementation(libs.build.r8)
+  implementation(libs.build.agp)
+}
diff --git a/build-logic/android-plugins/src/main/kotlin/Utils.kt b/build-logic/android-plugins/src/main/kotlin/Utils.kt
@@ -0,0 +1,7 @@
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.getByType
+
+internal val Project.libs: VersionCatalog
+  get() = extensions.getByType<VersionCatalogsExtension>().named("libs")
diff --git a/...-logic/android-plugins/src/main/kotlin/dev.skrilltrax.baka.android-application.gradle.kts b/...-logic/android-plugins/src/main/kotlin/dev.skrilltrax.baka.android-application.gradle.kts
@@ -11,11 +11,10 @@ fun Project.isSnapshot(): Boolean {
   }
 }
 
-@Suppress("UnstableApiUsage")
 android {
   val minifySwitch = project.providers.environmentVariable("DISABLE_MINIFY")
 
-  adbOptions.installOptions("--user 0")
+  adbOptions.setInstallOptions("--user 0")
 
   buildFeatures { buildConfig = true }
 

diff --git a/build-logic/android-plugins/src/main/kotlin/dev.skrilltrax.baka.android-common.gradle.kts b/build-logic/android-plugins/src/main/kotlin/dev.skrilltrax.baka.android-common.gradle.kts
@@ -1,10 +1,10 @@
 import com.android.build.gradle.TestedExtension
 
 extensions.configure<TestedExtension> {
-  setCompileSdkVersion(33)
+  setCompileSdkVersion(34)
   defaultConfig {
     minSdk = 23
-    targetSdk = 33
+    targetSdk = 34
   }
 
   sourceSets {
@@ -13,7 +13,6 @@ extensions.configure<TestedExtension> {
     named("androidTest") { java.srcDirs("src/androidTest/kotlin") }
   }
 
-  @Suppress("UnstableApiUsage")
   packagingOptions {
     resources.excludes.add("**/*.version")
     resources.excludes.add("**/*.txt")
@@ -24,12 +23,15 @@ extensions.configure<TestedExtension> {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    isCoreLibraryDesugaringEnabled = true
+    sourceCompatibility = JavaVersion.VERSION_19
+    targetCompatibility = JavaVersion.VERSION_19
   }
 
   testOptions {
     animationsDisabled = true
     unitTests.isReturnDefaultValues = true
   }
 }
+
+dependencies { "coreLibraryDesugaring"(libs.findLibrary("build.corelibdesugar").get()) }
diff --git a/build-logic/integration-plugins/build.gradle.kts b/build-logic/integration-plugins/build.gradle.kts
@@ -7,16 +7,17 @@ plugins { `kotlin-dsl` }
 
 afterEvaluate {
   tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = JavaVersion.VERSION_11.toString()
-    targetCompatibility = JavaVersion.VERSION_11.toString()
+    sourceCompatibility = JavaVersion.VERSION_19.toString()
+    targetCompatibility = JavaVersion.VERSION_19.toString()
   }
 
   tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
+    kotlinOptions { jvmTarget = JavaVersion.VERSION_19.toString() }
   }
 }
 
 dependencies {
+  implementation(libs.build.kotlin)
   implementation(libs.build.dependencyanalysis)
   implementation(libs.build.apollo.graphql)
   implementation(libs.build.anvil)

diff --git a/build-logic/integration-plugins/src/main/kotlin/dev.skrilltrax.baka.graphql.gradle.kts b/build-logic/integration-plugins/src/main/kotlin/dev.skrilltrax.baka.graphql.gradle.kts
@@ -1,3 +1,6 @@
 plugins { id("com.apollographql.apollo3") }
 
-apollo { packageName.set("dev.skrilltrax.baka.core.network") }
+apollo {
+  packageName.set("dev.skrilltrax.baka.core.network")
+  service("service") { packageName.set("dev.skrilltrax.baka.core.network") }
+}
diff --git a/build-logic/kotlin-plugins/build.gradle.kts b/build-logic/kotlin-plugins/build.gradle.kts
@@ -7,12 +7,12 @@ plugins { `kotlin-dsl` }
 
 afterEvaluate {
   tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = JavaVersion.VERSION_11.toString()
-    targetCompatibility = JavaVersion.VERSION_11.toString()
+    sourceCompatibility = JavaVersion.VERSION_19.toString()
+    targetCompatibility = JavaVersion.VERSION_19.toString()
   }
 
   tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
+    kotlinOptions { jvmTarget = JavaVersion.VERSION_19.toString() }
   }
 }
 

diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev.skrilltrax.baka.kotlin-common.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/dev.skrilltrax.baka.kotlin-common.gradle.kts
@@ -11,16 +11,16 @@ val additionalCompilerArgs =
   )
 
 tasks.withType<JavaCompile>().configureEach {
-  sourceCompatibility = JavaVersion.VERSION_11.toString()
-  targetCompatibility = JavaVersion.VERSION_11.toString()
+  sourceCompatibility = JavaVersion.VERSION_19.toString()
+  targetCompatibility = JavaVersion.VERSION_19.toString()
 }
 
 tasks.withType<KotlinCompile>().configureEach {
   kotlinOptions {
-    allWarningsAsErrors = true
-    jvmTarget = JavaVersion.VERSION_11.toString()
+    jvmTarget = JavaVersion.VERSION_19.toString()
     freeCompilerArgs = freeCompilerArgs + additionalCompilerArgs
-    languageVersion = "1.6"
+    languageVersion = "1.9"
+    allWarningsAsErrors = false
   }
 }
 

diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev.skrilltrax.baka.kotlin-kapt.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/dev.skrilltrax.baka.kotlin-kapt.gradle.kts
@@ -27,9 +27,9 @@ afterEvaluate {
   }
 }
 // disable kapt tasks for unit tests
-tasks.matching { it.name.startsWith("kapt") && it.name.endsWith("UnitTestKotlin") }.configureEach {
-  enabled = false
-}
+tasks
+  .matching { it.name.startsWith("kapt") && it.name.endsWith("UnitTestKotlin") }
+  .configureEach { enabled = false }
 
 fun Project.hasDaggerCompilerDependency(): Boolean {
   return configurations.any {

diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev.skrilltrax.baka.kotlin-library.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/dev.skrilltrax.baka.kotlin-library.gradle.kts
@@ -15,10 +15,13 @@ tasks.withType<KotlinCompile>().configureEach {
   }
 }
 
-tasks.koverXmlReport {
-  xmlReportFile.set(rootProject.layout.buildDirectory.file("coverage-reports/${project.name}.xml"))
-}
+extensions.configure<kotlinx.kover.gradle.plugin.dsl.KoverReportExtension> {
+  defaults {
+    // reports configs for XML, HTML, verify reports
+    html { setReportDir(rootProject.layout.buildDirectory.dir("coverage-reports/${project.name}")) }
 
-tasks.koverHtmlReport {
-  htmlReportDir.set(rootProject.layout.buildDirectory.dir("coverage-reports/${project.name}"))
+    xml {
+      setReportFile(rootProject.layout.buildDirectory.file("coverage-reports/${project.name}.xml"))
+    }
+  }
 }
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -14,6 +14,7 @@ dependencyResolutionManagement {
   repositories {
     google()
     mavenCentral()
+    maven("https://storage.googleapis.com/r8-releases/raw/main")
   }
   versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) } }
 }

diff --git a/core/util/src/main/kotlin/androidx/datastore/DataStoreFile.kt b/core/util/src/main/kotlin/androidx/datastore/DataStoreFile.kt
@@ -28,8 +28,7 @@ import java.io.File
  *
  * Do NOT use the file outside of DataStore.
  *
- * @this the context of the application used to get the files directory
- * @fileName the file name
+ * @this the context of the application used to get the files directory @fileName the file name
  */
 public fun dataStoreFile(filesDir: String, fileName: String): File =
   File(filesDir, "datastore/$fileName")
diff --git a/core/util/src/main/kotlin/androidx/datastore/preferences/PreferenceDataStoreDelegate.kt b/core/util/src/main/kotlin/androidx/datastore/preferences/PreferenceDataStoreDelegate.kt
@@ -47,17 +47,16 @@ import kotlinx.coroutines.SupervisorJob
  * ```
  *
  * @param name The name of the preferences. The preferences will be stored in a file in the
- * "datastore/" subdirectory in the application context's files directory and is generated using
- * [preferencesDataStoreFile].
+ *   "datastore/" subdirectory in the application context's files directory and is generated using
+ *   [preferencesDataStoreFile].
  * @param corruptionHandler The corruptionHandler is invoked if DataStore encounters a
- * [androidx.datastore.core.CorruptionException] when attempting to read data. CorruptionExceptions
- * are thrown by serializers when data can not be de-serialized.
+ *   [androidx.datastore.core.CorruptionException] when attempting to read data.
+ *   CorruptionExceptions are thrown by serializers when data can not be de-serialized.
  * @param produceMigrations produce the migrations. The ApplicationContext is passed in to these
- * callbacks as a parameter. DataMigrations are run before any access to data can occur. Each
- * producer and migration may be run more than once whether or not it already succeeded (potentially
- * because another migration failed or a write to disk failed.)
+ *   callbacks as a parameter. DataMigrations are run before any access to data can occur. Each
+ *   producer and migration may be run more than once whether or not it already succeeded
+ *   (potentially because another migration failed or a write to disk failed.)
  * @param scope The scope in which IO operations and transform functions will execute.
- *
  * @return a property delegate that manages a datastore as a singleton.
  */
 @Suppress("MissingJvmstatic")
@@ -109,7 +108,9 @@ internal constructor(
               corruptionHandler = corruptionHandler,
               migrations = produceMigrations(),
               scope = scope
-            ) { preferencesDataStoreFile(filesDir, name) }
+            ) {
+              preferencesDataStoreFile(filesDir, name)
+            }
         }
         INSTANCE!!
       }

diff --git a/gradle.properties b/gradle.properties
@@ -2,12 +2,16 @@
 # Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
 # SPDX-License-Identifier: GPL-3.0-only
 #
+
+# Enable experimental K2 compiler
+#kotlin.experimental.tryK2=true
+
 org.gradle.parallel=true
 org.gradle.configureondemand=false
 org.gradle.caching=true
 
 # Enable configuration cache
-org.gradle.unsafe.configuration-cache=false
+org.gradle.unsafe.configuration-cache=true
 org.gradle.unsafe.configuration-cache-problems=warn
 
 # Enable filesystem watching
@@ -47,7 +51,7 @@ android.enableResourceOptimizations=true
 android.defaults.buildfeatures.buildconfig=false
 android.defaults.buildfeatures.aidl=false
 android.defaults.buildfeatures.renderscript=false
-android.defaults.buildfeatures.resvalues=false
+android.defaults.buildfeatures.resvalu`es=false
 android.defaults.buildfeatures.shaders=false
 
 # Disable warnings about unsupported features, we know what we're doing