Skip to content

Commit d1dee0a

Browse files
authored
refactor(*): upgrade to Gradle 9.0.0 (#2710)
1 parent f4a4fc8 commit d1dee0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+146
-81
lines changed

admob/app/build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import com.android.build.gradle.internal.tasks.factory.dependsOn
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
id("com.android.application")
@@ -38,8 +39,10 @@ android {
3839
sourceCompatibility = JavaVersion.VERSION_17
3940
targetCompatibility = JavaVersion.VERSION_17
4041
}
41-
kotlinOptions {
42-
jvmTarget = "17"
42+
kotlin {
43+
compilerOptions {
44+
jvmTarget = JvmTarget.JVM_17
45+
}
4346
}
4447
buildFeatures {
4548
viewBinding = true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

analytics/app/build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import com.android.build.gradle.internal.tasks.factory.dependsOn
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
id("com.android.application")
@@ -36,8 +37,10 @@ android {
3637
targetCompatibility = JavaVersion.VERSION_17
3738
}
3839

39-
kotlinOptions {
40-
jvmTarget = "17"
40+
kotlin {
41+
compilerOptions {
42+
jvmTarget = JvmTarget.JVM_17
43+
}
4144
}
4245

4346
buildFeatures {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

appdistribution/app/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
id("com.android.application")
35
id("kotlin-android")
@@ -29,8 +31,10 @@ android {
2931
sourceCompatibility = JavaVersion.VERSION_17
3032
targetCompatibility = JavaVersion.VERSION_17
3133
}
32-
kotlinOptions {
33-
jvmTarget = "17"
34+
kotlin {
35+
compilerOptions {
36+
jvmTarget = JvmTarget.JVM_17
37+
}
3438
}
3539
buildFeatures {
3640
viewBinding = true

appdistribution/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ allprojects {
1717

1818
tasks {
1919
register("clean", Delete::class) {
20-
delete(rootProject.buildDir)
20+
delete(rootProject.layout.buildDirectory)
2121
}
2222
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

auth/app/build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import com.android.build.gradle.internal.tasks.factory.dependsOn
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
id("com.android.application")
@@ -36,8 +37,10 @@ android {
3637
sourceCompatibility = JavaVersion.VERSION_17
3738
targetCompatibility = JavaVersion.VERSION_17
3839
}
39-
kotlinOptions {
40-
jvmTarget = "17"
40+
kotlin {
41+
compilerOptions {
42+
jvmTarget = JvmTarget.JVM_17
43+
}
4144
}
4245

4346
buildFeatures {

auth/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ allprojects {
1717

1818
tasks {
1919
register("clean", Delete::class) {
20-
delete(rootProject.buildDir)
20+
delete(rootProject.layout.buildDirectory)
2121
}
2222
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)