Skip to content

Commit

Permalink
moved back to gradle 6.x because of backward compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
bgalek committed Oct 19, 2021
1 parent b9a6fb1 commit 488ca9a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/ci.yml
Expand Up @@ -15,13 +15,17 @@ jobs:

steps:
- uses: actions/checkout@v2

- uses: gradle/wrapper-validation-action@v1

- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Cache Gradle packages
uses: actions/cache@v2
with:
Expand All @@ -31,15 +35,16 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Test with Gradle
run: ./gradlew --no-daemon --continue check

- name: Jacoco
run: ./gradlew jacocoTestReport

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1

- name: Cleanup Gradle Cache
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
Expand Down
11 changes: 3 additions & 8 deletions build.gradle
Expand Up @@ -12,7 +12,7 @@ plugins {
id 'io.github.gradle-nexus.publish-plugin' version '1.0.0'
id 'com.coditory.integration-test' version "1.2.3"
id 'com.adarshr.test-logger' version '3.0.0'
id 'com.github.johnrengelman.shadow' version '7.0.0'
id 'com.github.johnrengelman.shadow' version '6.1.0'
}

scmVersion {
Expand Down Expand Up @@ -81,8 +81,8 @@ dependencies {
exclude group: 'org.eclipse.jgit', module: 'org.eclipse.jgit'
}

testImplementation group: 'org.testcontainers', name: 'spock', version: '1.16.0'
testImplementation group: 'org.spockframework', name: 'spock-core', version: '2.0-groovy-3.0'
testImplementation group: 'org.testcontainers', name: 'spock', version: '1.15.3'
testImplementation group: 'org.spockframework', name: 'spock-core', version: '2.0-groovy-2.5'
testImplementation group: 'cglib', name: 'cglib-nodep', version: '3.1'
testImplementation group: 'org.objenesis', name: 'objenesis', version: '2.4'
testImplementation group: 'org.apache.sshd', name: 'sshd-core', version: '1.6.0'
Expand All @@ -100,11 +100,6 @@ tasks.withType(Test) {
useJUnitPlatform()
}

wrapper {
gradleVersion = '7.1.1'
distributionType = Wrapper.DistributionType.BIN
}

task relocateShadowJar(type: ConfigureShadowRelocation) {
target = tasks.shadowJar
prefix = "axion"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 488ca9a

Please sign in to comment.