Skip to content

Commit 1de2fb7

Browse files
committed
Upgrade to Gradle 9
- Bump app version to 2.0
1 parent a3fba64 commit 1de2fb7

6 files changed

Lines changed: 20 additions & 23 deletions

File tree

app/build.gradle.kts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
plugins {
22
alias(libs.plugins.android.application)
3-
alias(libs.plugins.kotlin.android)
43
alias(libs.plugins.aboutLibraries)
54
}
65

76
android {
87
namespace = "com.wstxda.clippy"
9-
compileSdk = 36
8+
compileSdk {
9+
version = release(36) {
10+
minorApiLevel = 1
11+
}
12+
}
1013

1114
defaultConfig {
1215
applicationId = "com.wstxda.clippy"
1316
minSdk = 26
1417
targetSdk = 36
15-
versionCode = 170
16-
versionName = "1.7"
18+
versionCode = 200
19+
versionName = "2.0"
1720
}
1821

1922
buildTypes {
@@ -31,12 +34,6 @@ android {
3134
targetCompatibility = JavaVersion.VERSION_21
3235
}
3336

34-
kotlin {
35-
compilerOptions {
36-
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
37-
}
38-
}
39-
4037
buildFeatures {
4138
viewBinding = true
4239
}
@@ -46,6 +43,7 @@ android {
4643
includeInBundle = false
4744
}
4845

46+
//noinspection WrongGradleMethod
4947
aboutLibraries {
5048
library {
5149
duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
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
}

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
99
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
10-
# When configured, Gradle will run in incubating parallel mode.
11-
# This option should only be used with decoupled projects. For more details, visit
12-
# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
13-
# org.gradle.parallel=true
10+
org.gradle.parallel=true
11+
org.gradle.configuration-cache=true
12+
org.gradle.caching=true
1413
# AndroidX package structure to make it clearer which packages are bundled with the
1514
# Android operating system, and which are packaged with your app's APK
1615
# https://developer.android.com/topic/libraries/support-library/androidx-rn
@@ -20,4 +19,5 @@ kotlin.code.style=official
2019
# Enables namespacing of each library's R class so that its R class includes only the
2120
# resources declared in the library itself and none from the library's dependencies,
2221
# thereby reducing the size of the R class for that library
23-
android.nonTransitiveRClass=true
22+
android.nonTransitiveRClass=true
23+
android.enableR8.fullMode=true

gradle/libs.versions.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[versions]
2-
agp = "8.13.2"
3-
kotlin = "2.3.10"
2+
agp = "9.0.1"
43
preference = "1.2.1"
54
appcompat = "1.7.1"
65
fragment = "1.8.9"
@@ -20,5 +19,4 @@ aboutlibraries-view = { module = "com.mikepenz:aboutlibraries", version.ref = "a
2019

2120
[plugins]
2221
android-application = { id = "com.android.application", version.ref = "agp" }
23-
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
2422
aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "aboutLibraries" }
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#Mon May 19 15:50:02 BRT 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
4+
distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
6+
networkTimeout=10000
7+
validateDistributionUrl=true
58
zipStoreBase=GRADLE_USER_HOME
6-
zipStorePath=wrapper/dists
9+
zipStorePath=wrapper/dists

settings.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@file:Suppress("UnstableApiUsage")
2-
31
pluginManagement {
42
repositories {
53
google {
@@ -14,6 +12,7 @@ pluginManagement {
1412
}
1513
}
1614

15+
@Suppress("UnstableApiUsage")
1716
dependencyResolutionManagement {
1817
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1918
repositories {

0 commit comments

Comments
 (0)