JDK17 support (#24)

Co-authored-by: Anton K <[email protected]>
soramitsu · Mar 11, 2022 · d86bd7d · d86bd7d
1 parent 61d3e3a
commit d86bd7d
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/projects/01-java-app/gradle/wrapper/gradle-wrapper.properties b/projects/01-java-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/projects/02-java-lib/gradle/wrapper/gradle-wrapper.properties b/projects/02-java-lib/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/projects/03-kotlin-app/gradle/wrapper/gradle-wrapper.properties b/projects/03-kotlin-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/projects/04-kotlin-lib/gradle/wrapper/gradle-wrapper.properties b/projects/04-kotlin-lib/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/projects/05-java-spring-app/gradle/wrapper/gradle-wrapper.properties b/projects/05-java-spring-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/groovy/jp/co/soramitsu/devops/docker/DockerPlugin.groovy b/src/main/groovy/jp/co/soramitsu/devops/docker/DockerPlugin.groovy
@@ -251,6 +251,7 @@ class DockerPlugin implements Plugin<Project> {
             case 14:
             case 15:
             case 16:
+            case 17:
                 flags << "-XX:MaxRAMPercentage=70"
                 flags << "-XX:MinRAMPercentage=50"
                 flags << "-XX:InitialRAMPercentage=50"
@@ -269,6 +270,8 @@ class DockerPlugin implements Plugin<Project> {
             return 'openjdk:12-jdk-oracle'
         } else if (javaVersion == 13) {
             return 'openjdk:13'
+        } else if (javaVersion == 17) {
+            return 'openjdk:17-jdk-slim'
         } else {
             // default fallback version
             return 'openjdk:8-jre-alpine'

diff --git a/src/test/groovy/jp/co/soramitsu/devops/utils/BaseIntegrationTest.groovy b/src/test/groovy/jp/co/soramitsu/devops/utils/BaseIntegrationTest.groovy
@@ -8,7 +8,7 @@ import spock.lang.TempDir
 import java.nio.file.Path
 
 class BaseIntegrationTest extends Specification {
-    private static final String defaultGradleVersion = '7.1.1'
+    private static final String defaultGradleVersion = '7.4'
 
     @TempDir
     Path testProjectDir

diff --git a/src/test/groovy/jp/co/soramitsu/devops/utils/GradleProjectExecutor.groovy b/src/test/groovy/jp/co/soramitsu/devops/utils/GradleProjectExecutor.groovy
@@ -12,7 +12,7 @@ class GradleProjectExecutor {
 
     Logger logger = LoggerFactory.getLogger(GradleProjectExecutor.class)
 
-    private static final String defaultGradleVersion = '7.1.1'
+    private static final String defaultGradleVersion = '7.4'
 
     File projectDir
     protected File buildFile