Skip to content

Update: Dependencies #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rolf-Smit merged 1 commit into from
Feb 6, 2025
Merged

Update: Dependencies #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
java-version: '21'
- name: test
uses: reactivecircus/android-emulator-runner@v2
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ build/
plugin/src/test/test-fixtures/multi-module/gradle.properties
plugin/src/test/test-fixtures/multi-module/build.gradle
plugin/src/test/test-fixtures/multi-module/app/build.gradle
.kotlin/
4 changes: 3 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ POM_LICENCE_DIST=repo

POM_DEVELOPER_ID=rolf-smit
POM_DEVELOPER_NAME=Rolf Smit
POM_DEVELOPER_URL=https://github.com/rolf-smit
POM_DEVELOPER_URL=https://github.com/rolf-smit

org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
26 changes: 13 additions & 13 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[versions]
androidMinSdk = "21"
androidTargetSdk = "34"
androidCompileSdk = "34"
kotlin = "1.9.23"
androidGradlePlugin = "8.6.0"
androidTargetSdk = "35"
androidCompileSdk = "35"
kotlin = "2.1.10"
androidGradlePlugin = "8.8.0"

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

[bundles]
androidInstrumentedTest = ["supportTestRunner", "espressoCore", "androidJUnit"]
Expand All @@ -32,9 +32,9 @@ jvmTest = ["kotlinTest", "junit", "truth", "commonsCsv"]
[plugins]
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlinDokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
pluginPortalPublish = { id = "com.gradle.plugin-publish", version = "1.2.2" }
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.29.0" }
versionCheck = { id = "com.github.ben-manes.versions", version = "0.51.0" }
kotlinDokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
pluginPortalPublish = { id = "com.gradle.plugin-publish", version = "1.3.1" }
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
versionCheck = { id = "com.github.ben-manes.versions", version = "0.52.0" }
androidApp = { id = "com.android.application", version.ref = "androidGradlePlugin"}
androidLibrary = { id = "com.android.library", version.ref = "androidGradlePlugin"}
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
14 changes: 7 additions & 7 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import com.vanniktech.maven.publish.SonatypeHost
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
// Core Gradle plugins
Expand All @@ -25,10 +26,16 @@ version = VERSION_NAME
group = GROUP

java {
sourceCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_17
}
}

jacocoTestReport {
reports {
xml.required = true
Expand Down Expand Up @@ -65,8 +72,8 @@ tasks.named('javadoc') {
}
tasks.register('javadocJar', Jar) {
archiveClassifier.set('javadoc')
dependsOn tasks.dokkaHtml
from tasks.dokkaHtml
dependsOn tasks.dokkaGeneratePublicationHtml
from tasks.dokkaGeneratePublicationHtml
}
test {
testLogging {
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/kotlin/org/neotech/plugin/rootcoverage/RootCoveragePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import java.io.File

class RootCoveragePlugin : Plugin<Project> {

private val minimumRequiredAgpVersion = AndroidPluginVersion(8, 3, 0).alpha(5)
private val minimumRequiredAgpVersion = AndroidPluginVersion(8, 8, 0)

private lateinit var rootProjectExtension: RootCoveragePluginExtension

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/test/kotlin/org/neotech/plugin/rootcoverage/IntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class IntegrationTest(

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

val gradleVersions = arrayOf("8.7", "8.10")
val gradleVersions = arrayOf("8.10.2", "8.11.1", "8.12.1")

val configurations = File(fixture, "configurations").listFiles() ?: error("Configurations folder not found in $fixture")
return configurations.flatMap { configuration ->
Expand Down
6 changes: 3 additions & 3 deletions plugin/src/test/test-fixtures/multi-module/app/build.gradle.tmp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}

testOptions {
Expand All @@ -55,7 +55,7 @@ android {
}

kotlinOptions {
jvmTarget = "17"
jvmTarget = "21"
}
}

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/test/test-fixtures/multi-module/build.gradle.tmp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ task clean(type: Delete) {

jacoco {
// https://www.jacoco.org/jacoco/trunk/doc/changes.html
toolVersion = "0.8.7"
toolVersion = "0.8.12"
}

rootCoverage {
Expand Down
6 changes: 3 additions & 3 deletions plugin/src/test/test-fixtures/multi-module/library_android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

testOptions {
Expand All @@ -50,7 +50,7 @@ android {
}

kotlinOptions {
jvmTarget = "17"
jvmTarget = "21"
}
}

Expand Down
6 changes: 3 additions & 3 deletions plugin/src/test/test-fixtures/multi-module/library_android_flavors/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

testOptions {
Expand All @@ -60,7 +60,7 @@ android {
}

kotlinOptions {
jvmTarget = "17"
jvmTarget = "21"
}
}

Expand Down
4 changes: 2 additions & 2 deletions plugin/src/test/test-fixtures/multi-module/library_java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
}

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
4 changes: 2 additions & 2 deletions plugin/src/test/test-fixtures/multi-module/library_nested/java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
}

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21