Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion renovate.json → .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,31 @@
"allowedVersions": "!/(-alpha|-Alpha|-ALPHA|-beta|-Beta|-BETA|-milestone|-m|-SNAPSHOT)/"
}
],
ignorePresets: [
// Ensure we get the latest version and are not pinned to old versions.
'workarounds:javaLTSVersions',
],
"customManagers": [
{
"customType": "regex",
"fileMatch": ["\\.versions.toml$"],
"matchStrings": ["(^|\n)(?<depName>gradle) *= *\"(?<currentValue>.*)\""],
"depNameTemplate": "gradle",
"datasourceTemplate": "gradle-version"
}
},
// Update .java-version file with the latest JDK version.
{
customType: 'regex',
fileMatch: [
'\\.java-version$',
],
matchStrings: [
'(?<currentValue>.*)\\n',
],
datasourceTemplate: 'java-version',
depNameTemplate: 'java',
// Only write the major version.
extractVersionTemplate: '^(?<version>\\d+)',
},
]
}
1 change: 1 addition & 0 deletions .github/workflows/.java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
24
17 changes: 4 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,21 @@ concurrency:

jobs:
build:
name: JDK ${{ matrix.java_version }}, Config ${{ matrix.test_config_method }}
name: Config ${{ matrix.test_config_method }}
runs-on: ubuntu-latest

strategy:
matrix:
java_version: [11, 17, 24]
test_config_method: ["DSL", "PROPERTIES", "BASE"]

steps:
- name: Checkout
uses: actions/checkout@v5

- name: Install JDK ${{ matrix.java_version }}
uses: actions/setup-java@v5
- uses: actions/setup-java@v5
with:
distribution: zulu
java-version: ${{ matrix.java_version }}

- name: Install JDK 24
uses: actions/setup-java@v5
with:
distribution: zulu
java-version: 24
java-version-file: .github/workflows/.java-version

- name: Accept Android SDK license
run: echo -e "24333f8a63b6825ea9c5514f83c2829b004d1fee\n" > "$ANDROID_HOME/licenses/android-sdk-license"
Expand All @@ -43,10 +35,9 @@ jobs:

- name: Run ktlint
run: ./kotlinw ktlint.main.kts --fail-on-changes
if: ${{ matrix.java_version != '11' }}

- name: Build with Gradle
run: ./gradlew build --stacktrace -DtestJavaVersion=${{ matrix.java_version }} -DtestConfigMethod=${{ matrix.test_config_method }}
run: ./gradlew build --stacktrace -DtestConfigMethod=${{ matrix.test_config_method }}

# Status check that is required in branch protection rules.
build-status:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/setup-java@v5
with:
distribution: zulu
java-version: 11
java-version-file: .github/workflows/.java-version

- name: Set version for tag
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions/setup-java@v5
with:
distribution: zulu
java-version: 11
java-version-file: .github/workflows/.java-version

- name: Set version
run: |
Expand Down
14 changes: 0 additions & 14 deletions plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,6 @@ tasks.validatePlugins {
enableStricterValidation = true
}

tasks.whenTaskAdded {
if (name.contains("lint") && this::class.java.name.contains("com.android.build")) {
// TODO: lints can be run on Java 17 or above, remove this once we bump the min Java version to 17.
enabled = JavaVersion.current() >= JavaVersion.VERSION_17
}
}

val integrationTest by tasks.registering(Test::class) {
dependsOn(
tasks.publishToMavenLocal,
Expand All @@ -161,13 +154,6 @@ val integrationTest by tasks.registering(Test::class) {
testClassesDirs = integrationTestSourceSet.output.classesDirs
classpath = integrationTestSourceSet.runtimeClasspath

val testJavaVersion = System.getProperty("testJavaVersion")
if (testJavaVersion != null) {
javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(testJavaVersion.toInt())
}
}

useJUnitPlatform()
testLogging.showStandardStreams = true
maxHeapSize = "2g"
Expand Down