Resolve some gradle 8 deprecations.

Resolves #13788
signalapp · Nov 21, 2024 · 3eb1f68 · 3eb1f68
1 parent d5a2e13
commit 3eb1f68
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
@@ -76,6 +76,8 @@ dependencies {
 
 androidComponents {
     beforeVariants(selector().all()) {
-        it.enabled = it.buildType == "benchmark"
+        if (it.buildType != "benchmark") {
+            it.enable = false
+        }
     }
-}
+}
diff --git a/build-logic/plugins/build.gradle.kts b/build-logic/plugins/build.gradle.kts
@@ -14,8 +14,10 @@ java {
   targetCompatibility = signalJavaVersion
 }
 
-kotlinDslPluginOptions {
-  jvmTarget.set(signalKotlinJvmTarget)
+kotlin {
+  jvmToolchain {
+    languageVersion.set(JavaLanguageVersion.of(signalKotlinJvmTarget))
+  }
 }
 
 dependencies {

diff --git a/build-logic/plugins/src/main/java/signal-library.gradle.kts b/build-logic/plugins/src/main/java/signal-library.gradle.kts
@@ -27,7 +27,6 @@ android {
 
   defaultConfig {
     minSdk = signalMinSdkVersion
-    targetSdk = signalTargetSdkVersion
   }
 
   compileOptions {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -87,7 +87,7 @@ tasks.register("qa") {
 }
 
 tasks.register("clean", Delete::class) {
-  delete(rootProject.buildDir)
+  delete(rootProject.layout.buildDirectory)
 }
 
 tasks.register("format") {

diff --git a/microbenchmark/build.gradle.kts b/microbenchmark/build.gradle.kts
@@ -30,8 +30,6 @@ android {
 
   defaultConfig {
     minSdk = signalMinSdkVersion
-    targetSdk = signalTargetSdkVersion
-
     testInstrumentationRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner"
   }
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -21,11 +21,6 @@ dependencyResolutionManagement {
     maven {
       url = uri("https://dl.cloudsmith.io/qxAgwaeEE1vN8aLU/mobilecoin/mobilecoin/maven/")
     }
-    jcenter {
-      content {
-        includeVersion("mobi.upod", "time-duration-picker", "1.1.3")
-      }
-    }
   }
 }