diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1756ad2..19779f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,9 @@ jobs: - name: Check out uses: actions/checkout@v2 - name: Setup JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: temurin java-version: 11 - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v1 @@ -50,7 +51,7 @@ jobs: text: ${{ github.ref }} regex: '^refs/heads/(master|(\d+\.(?:\d+\.)x))$' # master or something like 0.8.x or 2.x - # Then publish if we are all set up to do so + # Then publish if we are all set up to do so - name: Determine status if: "${{ runner.os == 'Linux' }}" run: | diff --git a/convention/build.gradle.kts b/convention/build.gradle.kts index 52ffe85..ac7968c 100644 --- a/convention/build.gradle.kts +++ b/convention/build.gradle.kts @@ -12,9 +12,9 @@ tasks.withType(GroovyCompile::class).configureEach { dependencies { api(project(":spongegradle-plugin-development")) implementation(localGroovy()) - api("net.kyori:indra-common:2.0.5") - api("gradle.plugin.org.cadixdev.gradle:licenser:0.6.0") - api("com.google.code.gson:gson:2.8.6") + api("net.kyori:indra-common:2.0.6") + api("gradle.plugin.org.cadixdev.gradle:licenser:0.6.1") + api("com.google.code.gson:gson:2.8.9") } indraPluginPublishing { diff --git a/plugin-development/build.gradle.kts b/plugin-development/build.gradle.kts index e055c5f..56d406a 100644 --- a/plugin-development/build.gradle.kts +++ b/plugin-development/build.gradle.kts @@ -10,10 +10,10 @@ configurations.named(functionalTest.compileClasspathConfigurationName) { extends configurations.named(functionalTest.runtimeClasspathConfigurationName) { extendsFrom(configurations.testRuntimeClasspath.get()) } dependencies { - functionalTest.implementationConfigurationName("com.google.code.gson:gson:2.8.7") - testImplementation("org.junit.jupiter:junit-jupiter-params:5.7.2") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2") + functionalTest.implementationConfigurationName("com.google.code.gson:gson:2.8.9") + testImplementation("org.junit.jupiter:junit-jupiter-params:5.8.2") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") } val functionalTestTask = tasks.register("functionalTest", Test::class) { diff --git a/plugin-development/src/functionalTest/java/org/spongepowered/gradle/plugin/SpongePluginPluginFunctionalTest.java b/plugin-development/src/functionalTest/java/org/spongepowered/gradle/plugin/SpongePluginPluginFunctionalTest.java index 57405e5..8c30888 100644 --- a/plugin-development/src/functionalTest/java/org/spongepowered/gradle/plugin/SpongePluginPluginFunctionalTest.java +++ b/plugin-development/src/functionalTest/java/org/spongepowered/gradle/plugin/SpongePluginPluginFunctionalTest.java @@ -139,10 +139,10 @@ Stream functionalTests(@TempDir final Path runDirectory) { // Test variants final String[][] variants = { - {"6.9.1", ""}, - {"7.2", ""}, - {"6.9.1", "--configuration-cache"}, - {"7.2", "--configuration-cache"}, + {"6.9.2", ""}, + {"7.3.3", ""}, + {"6.9.2", "--configuration-cache"}, + {"7.3.3", "--configuration-cache"}, }; // The actual tests to execute diff --git a/settings.gradle.kts b/settings.gradle.kts index 447ed86..65da97d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,7 @@ pluginManagement { plugins { val indraVersion = "2.0.6" - id("com.gradle.plugin-publish") version "0.14.0" + id("com.gradle.plugin-publish") version "0.20.0" id("net.kyori.indra") version indraVersion id("net.kyori.indra.license-header") version indraVersion id("net.kyori.indra.publishing.gradle-plugin") version indraVersion