Skip to content

Commit 02d95bb

Browse files
Rolf-SmitRolf-Smit
authored
Update: Dependencies (#114)
This includes AGP update to version 8.8 and Gradle to 8.10.2
1 parent 5ef57a1 commit 02d95bb

File tree

17 files changed

+62
-52
lines changed

17 files changed

+62
-52
lines changed

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-java@v4
1919
with:
2020
distribution: 'zulu'
21-
java-version: '17'
21+
java-version: '21'
2222
- name: test
2323
uses: reactivecircus/android-emulator-runner@v2
2424
with:

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ build/
1717
plugin/src/test/test-fixtures/multi-module/gradle.properties
1818
plugin/src/test/test-fixtures/multi-module/build.gradle
1919
plugin/src/test/test-fixtures/multi-module/app/build.gradle
20+
.kotlin/

‎gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,6 @@ POM_LICENCE_DIST=repo
2626

2727
POM_DEVELOPER_ID=rolf-smit
2828
POM_DEVELOPER_NAME=Rolf Smit
29-
POM_DEVELOPER_URL=https://github.com/rolf-smit
29+
POM_DEVELOPER_URL=https://github.com/rolf-smit
30+
31+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

‎gradle/libs.versions.toml

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[versions]
22
androidMinSdk = "21"
3-
androidTargetSdk = "34"
4-
androidCompileSdk = "34"
5-
kotlin = "1.9.23"
6-
androidGradlePlugin = "8.6.0"
3+
androidTargetSdk = "35"
4+
androidCompileSdk = "35"
5+
kotlin = "2.1.10"
6+
androidGradlePlugin = "8.8.0"
77

88
[libraries]
99
appCompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
@@ -17,12 +17,12 @@ truth = { module = "com.google.truth:truth",
1717
supportTestRunner = { module = "androidx.test:runner", version = "1.6.2" }
1818
espressoCore = { module = "androidx.test.espresso:espresso-core", version = "3.6.1" }
1919
androidJUnit = { module = "androidx.test.ext:junit", version = "1.2.1" }
20-
commonsCsv = { module = "org.apache.commons:commons-csv", version = "1.11.0" }
20+
commonsCsv = { module = "org.apache.commons:commons-csv", version = "1.13.0" }
2121
kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
22-
robolectric = { module = "org.robolectric:robolectric", version = "4.13" }
23-
mockk = { module = "io.mockk:mockk", version = "1.13.12" }
24-
jacksonYaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version = "2.17.2"}
25-
jacksonKotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version = "2.17.2"}
22+
robolectric = { module = "org.robolectric:robolectric", version = "4.14.1" }
23+
mockk = { module = "io.mockk:mockk", version = "1.13.16" }
24+
jacksonYaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version = "2.18.2"}
25+
jacksonKotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version = "2.18.2"}
2626

2727
[bundles]
2828
androidInstrumentedTest = ["supportTestRunner", "espressoCore", "androidJUnit"]
@@ -32,9 +32,9 @@ jvmTest = ["kotlinTest", "junit", "truth", "commonsCsv"]
3232
[plugins]
3333
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
3434
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
35-
kotlinDokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
36-
pluginPortalPublish = { id = "com.gradle.plugin-publish", version = "1.2.2" }
37-
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.29.0" }
38-
versionCheck = { id = "com.github.ben-manes.versions", version = "0.51.0" }
35+
kotlinDokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
36+
pluginPortalPublish = { id = "com.gradle.plugin-publish", version = "1.3.1" }
37+
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
38+
versionCheck = { id = "com.github.ben-manes.versions", version = "0.52.0" }
3939
androidApp = { id = "com.android.application", version.ref = "androidGradlePlugin"}
4040
androidLibrary = { id = "com.android.library", version.ref = "androidGradlePlugin"}

‎gradle/wrapper/gradle-wrapper.jar

-19.8 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

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

‎gradlew

+7-7
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145145
case $MAX_FD in #(
146146
max*)
147147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
149149
MAX_FD=$( ulimit -H -n ) ||
150150
warn "Could not query maximum file descriptor limit"
151151
esac
152152
case $MAX_FD in #(
153153
'' | soft) :;; #(
154154
*)
155155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
157157
ulimit -n "$MAX_FD" ||
158158
warn "Could not set maximum file descriptor limit to $MAX_FD"
159159
esac
@@ -202,11 +202,11 @@ fi
202202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204204

205-
# Collect all arguments for the java command;
206-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
207-
# shell script including quotes and variable substitutions, so put them in
208-
# double quotes to make sure that they get re-expanded; and
209-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
210210

211211
set -- \
212212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

‎gradlew.bat

+10-10
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
4343
%JAVA_EXE% -version >NUL 2>&1
4444
if %ERRORLEVEL% equ 0 goto execute
4545

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
46+
echo. 1>&2
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
48+
echo. 1>&2
49+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
50+
echo location of your Java installation. 1>&2
5151

5252
goto fail
5353

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5757

5858
if exist "%JAVA_EXE%" goto execute
5959

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
60+
echo. 1>&2
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
62+
echo. 1>&2
63+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
64+
echo location of your Java installation. 1>&2
6565

6666
goto fail
6767

‎plugin/build.gradle

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import com.vanniktech.maven.publish.SonatypeHost
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
// Core Gradle plugins
@@ -25,10 +26,16 @@ version = VERSION_NAME
2526
group = GROUP
2627

2728
java {
28-
sourceCompatibility = JavaVersion.VERSION_17
29+
sourceCompatibility = JavaVersion.VERSION_21
2930
targetCompatibility = JavaVersion.VERSION_17
3031
}
3132

33+
kotlin {
34+
compilerOptions {
35+
jvmTarget = JvmTarget.JVM_17
36+
}
37+
}
38+
3239
jacocoTestReport {
3340
reports {
3441
xml.required = true
@@ -65,8 +72,8 @@ tasks.named('javadoc') {
6572
}
6673
tasks.register('javadocJar', Jar) {
6774
archiveClassifier.set('javadoc')
68-
dependsOn tasks.dokkaHtml
69-
from tasks.dokkaHtml
75+
dependsOn tasks.dokkaGeneratePublicationHtml
76+
from tasks.dokkaGeneratePublicationHtml
7077
}
7178
test {
7279
testLogging {

‎plugin/src/main/kotlin/org/neotech/plugin/rootcoverage/RootCoveragePlugin.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import java.io.File
2626

2727
class RootCoveragePlugin : Plugin<Project> {
2828

29-
private val minimumRequiredAgpVersion = AndroidPluginVersion(8, 3, 0).alpha(5)
29+
private val minimumRequiredAgpVersion = AndroidPluginVersion(8, 8, 0)
3030

3131
private lateinit var rootProjectExtension: RootCoveragePluginExtension
3232

‎plugin/src/test/kotlin/org/neotech/plugin/rootcoverage/IntegrationTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class IntegrationTest(
232232

233233
val fixture = File("src/test/test-fixtures/multi-module")
234234

235-
val gradleVersions = arrayOf("8.7", "8.10")
235+
val gradleVersions = arrayOf("8.10.2", "8.11.1", "8.12.1")
236236

237237
val configurations = File(fixture, "configurations").listFiles() ?: error("Configurations folder not found in $fixture")
238238
return configurations.flatMap { configuration ->

‎plugin/src/test/test-fixtures/multi-module/app/build.gradle.tmp

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ android {
4040
}
4141

4242
compileOptions {
43-
sourceCompatibility JavaVersion.VERSION_17
44-
targetCompatibility JavaVersion.VERSION_17
43+
sourceCompatibility JavaVersion.VERSION_21
44+
targetCompatibility JavaVersion.VERSION_21
4545
}
4646

4747
testOptions {
@@ -55,7 +55,7 @@ android {
5555
}
5656

5757
kotlinOptions {
58-
jvmTarget = "17"
58+
jvmTarget = "21"
5959
}
6060
}
6161

‎plugin/src/test/test-fixtures/multi-module/build.gradle.tmp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ task clean(type: Delete) {
1717

1818
jacoco {
1919
// https://www.jacoco.org/jacoco/trunk/doc/changes.html
20-
toolVersion = "0.8.7"
20+
toolVersion = "0.8.12"
2121
}
2222

2323
rootCoverage {

‎plugin/src/test/test-fixtures/multi-module/library_android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ android {
3333
}
3434

3535
compileOptions {
36-
sourceCompatibility = JavaVersion.VERSION_17
37-
targetCompatibility = JavaVersion.VERSION_17
36+
sourceCompatibility = JavaVersion.VERSION_21
37+
targetCompatibility = JavaVersion.VERSION_21
3838
}
3939

4040
testOptions {
@@ -50,7 +50,7 @@ android {
5050
}
5151

5252
kotlinOptions {
53-
jvmTarget = "17"
53+
jvmTarget = "21"
5454
}
5555
}
5656

‎plugin/src/test/test-fixtures/multi-module/library_android_flavors/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ android {
4343
}
4444

4545
compileOptions {
46-
sourceCompatibility = JavaVersion.VERSION_17
47-
targetCompatibility = JavaVersion.VERSION_17
46+
sourceCompatibility = JavaVersion.VERSION_21
47+
targetCompatibility = JavaVersion.VERSION_21
4848
}
4949

5050
testOptions {
@@ -60,7 +60,7 @@ android {
6060
}
6161

6262
kotlinOptions {
63-
jvmTarget = "17"
63+
jvmTarget = "21"
6464
}
6565
}
6666

‎plugin/src/test/test-fixtures/multi-module/library_java/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ dependencies {
66
implementation fileTree(dir: 'libs', include: ['*.jar'])
77
}
88

9-
sourceCompatibility = JavaVersion.VERSION_17
10-
targetCompatibility = JavaVersion.VERSION_17
9+
sourceCompatibility = JavaVersion.VERSION_21
10+
targetCompatibility = JavaVersion.VERSION_21

‎plugin/src/test/test-fixtures/multi-module/library_nested/java/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ dependencies {
66
implementation fileTree(dir: 'libs', include: ['*.jar'])
77
}
88

9-
sourceCompatibility = JavaVersion.VERSION_17
10-
targetCompatibility = JavaVersion.VERSION_17
9+
sourceCompatibility = JavaVersion.VERSION_21
10+
targetCompatibility = JavaVersion.VERSION_21

0 commit comments

Comments
 (0)