Skip to content

Commit

Permalink
*: Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
zml2008 committed Jan 20, 2022
1 parent 918389e commit 2813c40
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions convention/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions plugin-development/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ Stream<DynamicTest> 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
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2813c40

Please sign in to comment.