Skip to content

Commit 186f516

Browse files
committed
Upgrade to AGP 9.3.0 / Gradle 9.6.1
Android Studio staged this upgrade during a background sync (previously uncommitted). Completing it properly: - Drop the standalone kotlin-android plugin; AGP 9's built-in Kotlin compilation replaces it (the two conflict: "Cannot add extension with name 'kotlin'"). - Switch app/build.gradle to Groovy's '=' property-assignment syntax (the old bare 'propName value' form is deprecated, removed in Gradle 10). Verified: assembleDebug, assembleRelease, and lintDebug all pass clean with no warnings, and the release APK still verifies with the same signing certificate as before (SHA-256 738b8440...), so it remains a valid update path.
1 parent 00d2503 commit 186f516

8 files changed

Lines changed: 130 additions & 127 deletions

File tree

app/build.gradle

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
id 'com.android.application'
3-
id 'kotlin-android'
43
}
54

65
def keystoreProperties = new Properties()
@@ -10,44 +9,40 @@ if (keystorePropertiesFile.exists()) {
109
}
1110

1211
android {
13-
namespace 'com.sleepbutton.app'
14-
compileSdk 34
12+
namespace = 'com.sleepbutton.app'
13+
compileSdk = 34
1514

1615
defaultConfig {
17-
applicationId "com.sleepbutton.app"
18-
minSdk 26 // Android 8.0 – TYPE_APPLICATION_OVERLAY is stable from here
19-
targetSdk 34
20-
versionCode 1
21-
versionName "1.0"
16+
applicationId = "com.sleepbutton.app"
17+
minSdk = 26 // Android 8.0 – TYPE_APPLICATION_OVERLAY is stable from here
18+
targetSdk = 34
19+
versionCode = 1
20+
versionName = "1.0"
2221
}
2322

2423
signingConfigs {
2524
release {
2625
if (keystorePropertiesFile.exists()) {
27-
storeFile file(keystoreProperties['storeFile'])
28-
storePassword keystoreProperties['storePassword']
29-
keyAlias keystoreProperties['keyAlias']
30-
keyPassword keystoreProperties['keyPassword']
26+
storeFile = file(keystoreProperties['storeFile'])
27+
storePassword = keystoreProperties['storePassword']
28+
keyAlias = keystoreProperties['keyAlias']
29+
keyPassword = keystoreProperties['keyPassword']
3130
}
3231
}
3332
}
3433

3534
buildTypes {
3635
release {
37-
minifyEnabled true
38-
shrinkResources true
36+
minifyEnabled = true
37+
shrinkResources = true
3938
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
40-
signingConfig signingConfigs.release
39+
signingConfig = signingConfigs.release
4140
}
4241
}
4342

4443
compileOptions {
45-
sourceCompatibility JavaVersion.VERSION_17
46-
targetCompatibility JavaVersion.VERSION_17
47-
}
48-
49-
kotlinOptions {
50-
jvmTarget = '17'
44+
sourceCompatibility = JavaVersion.VERSION_17
45+
targetCompatibility = JavaVersion.VERSION_17
5146
}
5247
}
5348

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Top-level build file
22
plugins {
3-
id 'com.android.application' version '8.2.2' apply false
4-
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
3+
id 'com.android.application' version '9.3.0' apply false
54
}
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/5b9591a15a17a2a590aa9c347d3c2cc0/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b2464ba80c230a71ce5ddafc5fef6ac1/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/5b9591a15a17a2a590aa9c347d3c2cc0/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b2464ba80c230a71ce5ddafc5fef6ac1/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/8e3a8cffff6cb6225070c24826d27787/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b72dff7fe21ab8aef871517ef12a3667/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/5b9591a15a17a2a590aa9c347d3c2cc0/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b2464ba80c230a71ce5ddafc5fef6ac1/redirect
10+
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/72d85c5e7c5049b9755b2c360b111cd5/redirect
11+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/3ebfa4ecec5ee0165895f2bc0adf3ba9/redirect
12+
toolchainVendor=JETBRAINS
13+
toolchainVersion=17

gradle/wrapper/gradle-wrapper.jar

-14.9 KB
Binary file not shown.
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
4+
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
7+
validateDistributionUrl=true
48
zipStoreBase=GRADLE_USER_HOME
59
zipStorePath=wrapper/dists

gradlew

Lines changed: 10 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 82 additions & 92 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ pluginManagement {
55
gradlePluginPortal()
66
}
77
}
8+
plugins {
9+
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
10+
}
811
dependencyResolutionManagement {
912
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1013
repositories {

0 commit comments

Comments
 (0)