Skip to content

Commit 5ff925f

Browse files
committed
fix(build): gradle v9 fixes
1 parent 973dd38 commit 5ff925f

4 files changed

Lines changed: 13 additions & 14 deletions

File tree

app/build.gradle.kts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1+
import com.android.build.api.dsl.ApplicationExtension
12
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
alias(libs.plugins.android.application)
5-
alias(libs.plugins.kotlin.android)
66
alias(libs.plugins.kotlin.compose)
77
}
88

9-
android {
9+
kotlin {
10+
compilerOptions {
11+
jvmTarget.set(JvmTarget.JVM_23)
12+
}
13+
}
14+
15+
configure<ApplicationExtension> {
1016
namespace = "org.nsh07.simplygraph"
1117
compileSdk = 36
1218

@@ -46,12 +52,6 @@ android {
4652
targetCompatibility = JavaVersion.VERSION_23
4753
}
4854

49-
kotlin {
50-
compilerOptions {
51-
jvmTarget.set(JvmTarget.JVM_23)
52-
}
53-
}
54-
5555
buildFeatures {
5656
compose = true
5757
}
@@ -62,12 +62,13 @@ android {
6262
}
6363
}
6464

65-
sourceSets["main"].jniLibs.srcDirs("src/main/jniLibs")
65+
sourceSets["main"].jniLibs {
66+
directories.add("src/main/jniLibs")
67+
}
6668

6769
splits {
6870
abi {
6971
isEnable = true
70-
// Optionally, specify a universal APK
7172
isUniversalApk = true
7273
reset()
7374
include("arm64-v8a", "x86_64")

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
33
alias(libs.plugins.android.application) apply false
4-
alias(libs.plugins.kotlin.android) apply false
54
alias(libs.plugins.kotlin.compose) apply false
65
}

gradle/libs.versions.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
agp = "8.13.2"
2+
agp = "9.1.0"
33
kotlin = "2.3.10"
44
coreKtx = "1.17.0"
55
junit = "4.13.2"
@@ -28,6 +28,5 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3"
2828

2929
[plugins]
3030
android-application = { id = "com.android.application", version.ref = "agp" }
31-
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
3231
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
3332

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)