Skip to content

Commit 980eb96

Browse files
upgrade android gradle plugin
1 parent f1d6faf commit 980eb96

5 files changed

Lines changed: 31 additions & 5 deletions

File tree

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath("com.android.tools.build:gradle:8.11.0")
9-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0")
8+
classpath("com.android.tools.build:gradle:9.2.1")
9+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.10")
1010
}
1111
}
1212

gradle.properties

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,19 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
1616
# https://developer.android.com/topic/libraries/support-library/androidx-rn
1717
android.useAndroidX=true
1818
# Automatically convert third-party libraries to use AndroidX
19-
android.enableJetifier=true
19+
android.enableJetifier=false
2020
# Kotlin code style for this project: "official" or "obsolete":
2121
kotlin.code.style=official
2222
org.gradle.unsafe.configuration-cache=true
2323
android.nonTransitiveRClass=true
2424
android.nonFinalResIds=false
25+
android.defaults.buildfeatures.resvalues=true
26+
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
27+
android.enableAppCompileTimeRClass=false
28+
android.usesSdkInManifest.disallowed=false
29+
android.uniquePackageNames=false
30+
android.dependency.useConstraints=true
31+
android.r8.strictFullModeForKeepRules=false
32+
android.r8.optimizedResourceShrinking=false
33+
android.builtInKotlin=false
34+
android.newDsl=false
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7083b89563e7ce20943037b8cd2b8cc2/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/060bbb778a1f55ea705fdebd2ccfeab9/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
10+
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d09679dc60fe5aa05ef7d03efdefac20/redirect
11+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ed4e3bf2f5e7c5d9aabc4cbd8acd555e/redirect
12+
toolchainVendor=JETBRAINS
13+
toolchainVersion=21

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
4-
distributionSha256Sum=443c9c8ee2ac1ee0e11881a40f2376d79c66386264a44b24a9f8ca67e633375f
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip
4+
distributionSha256Sum=708d2c6ecc97ca9a11838ef64a6c2301151b8dd10387e22dc1a12c30557cab5b
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
plugins {
2+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
3+
}
14
dependencyResolutionManagement {
25
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
36
repositories {

0 commit comments

Comments
 (0)