mirror of
https://github.com/fankes/moshi.git
synced 2025-10-18 15:39:22 +08:00
Update CI/build infra (#1852)
* Update CI/build infra - Gradle caching on CI - JDK 21 - Move gradle wrapper validation to a separate workflow that only runs on changes to those files * Update .github/workflows/gradle-wrapper.yml Co-authored-by: Jake Wharton <jw@squareup.com> --------- Co-authored-by: Jake Wharton <jw@squareup.com>
This commit is contained in:
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
@@ -16,16 +16,16 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Validate Gradle Wrapper
|
||||
uses: gradle/actions/wrapper-validation@v3
|
||||
|
||||
- name: Configure JDK
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: 'zulu'
|
||||
java-version: '20'
|
||||
java-version: '21'
|
||||
cache: 'gradle'
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
|
||||
- name: Test
|
||||
run: ./gradlew build check --stacktrace -PkotlinTestMode=${{ matrix.kotlin-test-mode }}
|
||||
|
||||
|
15
.github/workflows/gradle-wrapper.yml
vendored
Normal file
15
.github/workflows/gradle-wrapper.yml
vendored
Normal file
@@ -0,0 +1,15 @@
|
||||
name: gradle-wrapper
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
paths:
|
||||
- 'gradlew'
|
||||
- 'gradlew.bat'
|
||||
- 'gradle/wrapper/**'
|
||||
|
||||
jobs:
|
||||
validate:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: gradle/actions/wrapper-validation@v3
|
@@ -77,7 +77,7 @@ subprojects {
|
||||
pluginManager.withPlugin("java") {
|
||||
configure<JavaPluginExtension> {
|
||||
toolchain {
|
||||
languageVersion.set(JavaLanguageVersion.of(20))
|
||||
languageVersion.set(libs.versions.jdk.map(JavaLanguageVersion::of))
|
||||
}
|
||||
}
|
||||
if (project.name != "records-tests") {
|
||||
|
@@ -1,5 +1,6 @@
|
||||
[versions]
|
||||
autoService = "1.1.1"
|
||||
jdk = "21"
|
||||
jvmTarget = "1.8"
|
||||
kotlin = "2.0.0"
|
||||
# No 0.5.0 full release yet due to KSP's 1.0.21 release being busted for CLI/programmatic use
|
||||
|
@@ -19,11 +19,11 @@ val java16: SourceSet by sourceSets.creating {
|
||||
}
|
||||
}
|
||||
|
||||
// We use JDK 17 for latest but target 16 for maximum compatibility
|
||||
// We use newer JDKs but target 16 for maximum compatibility
|
||||
val service = project.extensions.getByType<JavaToolchainService>()
|
||||
val customLauncher =
|
||||
service.launcherFor {
|
||||
languageVersion.set(JavaLanguageVersion.of(17))
|
||||
languageVersion.set(libs.versions.jdk.map(JavaLanguageVersion::of))
|
||||
}
|
||||
|
||||
tasks.named<JavaCompile>("compileJava16Java") {
|
||||
|
Reference in New Issue
Block a user