Skip to content

Commit af0245f

Browse files
committed
Glimpse: Update Gradle wrapper and AGP
- Update Gradle wrapper to 9.4.1 - Update AGP to 9.1.0 - Drop Android Kotlin plugin (move to Gradle Kotlin support) - Remove Kotlin's JVM target version (will now automatically use `android` one) Change-Id: I6b1db213bddf2e67ec38c549d157b7fca6e68151
1 parent ea98358 commit af0245f

7 files changed

Lines changed: 4 additions & 15 deletions

File tree

app/build.gradle.kts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
7-
86
plugins {
97
alias(libs.plugins.android.application)
10-
alias(libs.plugins.kotlin.android)
118
alias(libs.plugins.lineageos.generatebp)
129
}
1310

@@ -48,12 +45,6 @@ android {
4845
targetCompatibility = JavaVersion.VERSION_17
4946
}
5047

51-
kotlin {
52-
compilerOptions {
53-
jvmTarget.set(JvmTarget.JVM_17)
54-
}
55-
}
56-
5748
lint {
5849
lintConfig = file("lint.xml")
5950
}

app/libs/Android.bp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ android_library_import {
3434
"androidx.core_core",
3535
"Glimpse_androidx.media3_media3-common",
3636
"Glimpse_androidx.media3_media3-exoplayer",
37+
"kotlin-stdlib-jdk8",
3738
"kotlinx-coroutines-android",
3839
"kotlinx-coroutines-core",
3940
],

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@
66
// Top-level build file where you can add configuration options common to all sub-projects/modules.
77
plugins {
88
alias(libs.plugins.android.application) apply false
9-
alias(libs.plugins.kotlin.android) apply false
109
alias(libs.plugins.lineageos.generatebp) apply false
1110
}

gradle/libs.versions.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
#
55

66
[versions]
7-
agp = "8.13.0"
8-
kotlin = "2.1.10"
7+
agp = "9.1.0"
98
activity = "1.9.2"
109
appcompat = "1.7.0"
1110
constraintlayout = "2.1.4"
@@ -56,5 +55,4 @@ zoomimage-view-glide = { group = "io.github.panpf.zoomimage", name = "zoomimage-
5655

5756
[plugins]
5857
android-application = { id = "com.android.application", version.ref = "agp" }
59-
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
6058
lineageos-generatebp = { id = "org.lineageos.generatebp", version.ref = "generateBp" }

gradle/wrapper/gradle-wrapper.jar

3.43 KB
Binary file not shown.

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-9.1.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)