Fix build and update Anvil

SteinerOk · Jul 31, 2023 · da049fe · da049fe
1 parent dfbdf4a
commit da049fe
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/build-logic-settings/scan-plugin/build.gradle.kts b/build-logic-settings/scan-plugin/build.gradle.kts
@@ -6,7 +6,7 @@ group = "dev.steinerok.buildlogicsettings"
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 

diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -6,7 +6,7 @@ group = "dev.helpdesk.buildlogic"
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 

diff --git a/build-logic/convention/src/main/kotlin/internal.steinerok.sealant.android-base.gradle.kts b/build-logic/convention/src/main/kotlin/internal.steinerok.sealant.android-base.gradle.kts
@@ -17,7 +17,7 @@ val Project.libs: LibrariesForLibs
     get() = the()
 
 @Suppress("UnstableApiUsage")
-val commonAndroidConfiguration: CommonExtension<*, *, *, *>.() -> Unit = {
+val commonAndroidConfiguration: CommonExtension<*, *, *, *, *>.() -> Unit = {
     buildToolsVersion = versions.android.buildToolsVersion.get()
     ndkVersion = versions.android.ndkVersion.get()
     compileSdk = versions.android.compileSdk.get().toInt()
@@ -35,13 +35,6 @@ val commonAndroidConfiguration: CommonExtension<*, *, *, *>.() -> Unit = {
         androidTestImplementation(libs.androidx.test.ext.junit)
         androidTestImplementation(libs.androidx.test.ext.junitKtx)
     }
-
-    // Can remove this once https://issuetracker.google.com/issues/260059413 is fixed.
-    // See https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
 }
 
 plugins.withType<JavaBasePlugin>().configureEach {

diff --git a/gradle/configuration.toml b/gradle/configuration.toml
@@ -1,5 +1,5 @@
 [versions]
-gradle = "8.1.1"
+gradle = "8.2.1"
 javaToolchain = "17"
 android-buildToolsVersion = "34.0.0"
 android-ndkVersion = "25.2.9519653"

diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
@@ -6,7 +6,7 @@ androidPlugin = "8.1.0"
 versionsPlugin = "0.47.0"
 spotlessPlugin = "6.20.0"
 ktlintTool = "0.49.1"
-anvilPlugin = "2.4.6"
+anvilPlugin = "2.4.7"
 grgitPlugin = "5.2.0"
 mavenPublishPlugin = "0.25.3"
 # KotlinX libraries
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ group = "dev.steinerok.buildlogicsettings" @@
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(11))
+            languageVersion.set(JavaLanguageVersion.of(17))
         }
     }
@@ Expand Down @@