Merge pull request #24 from devatherock/gradle-7-groovy-3

chore: Upgraded to gradle 7

.circleci/config.yml

@@ -1,6 +1,6 @@
 docker_image: &docker_image
   docker:
-    - image: cimg/openjdk:11.0
+    - image: cimg/openjdk:17.0
       auth:
         username: $DOCKER_USERNAME
         password: $DOCKER_PASSWORD
@@ -10,6 +10,18 @@ resource_class: &resource_class
 
 work_directory: &work_directory
   working_directory: ~/git-sync
+
+release_filter: &release_filter
+  filters:
+    branches:
+      only: non-existent-branch
+    tags:
+      only: /^v[0-9\.]+$/
+
+pr_filter: &pr_filter
+  filters:
+    branches:
+      ignore: master
 
 executors:
   docker-executor:
@@ -41,7 +53,7 @@ jobs:
 
   groovy_script_to_jar:
     docker:
-      - image: devatherock/drone-groovy-script-to-jar:0.6.2
+      - image: devatherock/scriptjar:1.0.0
         auth:
           username: $DOCKER_USERNAME
           password: $DOCKER_PASSWORD
@@ -174,31 +186,24 @@ workflows:
       - publish_release:
           context:
             - docker-credentials
-          filters:
-            branches:
-              only: non-existent-branch
-            tags:
-              only: /^v[0-9\.]+$/
+          <<: *release_filter
       - notify:
           context:
             - docker-credentials
             - slack-webhook
+          <<: *release_filter
           requires:
             - publish_release
   pr_check:
     jobs:
       - test:
           context:
             - docker-credentials
-          filters:
-            branches:
-              ignore: master
+          <<: *pr_filter
       - groovy_script_to_jar:
           context:
             - docker-credentials
-          filters:
-            branches:
-              ignore: master
+          <<: *pr_filter
           requires:
             - test    
       - docker_build_dry_run:

.gitignore

@@ -8,5 +8,6 @@ git-sync.iml
 .classpath
 /bin/
 .settings
+code-formatter.xml
 checkstyle.xml
 git-sync-test

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## [Unreleased]
 ### Changed
 - Used custom ssh key to push to github
+- Upgraded to gradle 7 and groovy 3
 
 ## [2.0.0] - 2021-10-29
 ### Added

Makefile

@@ -0,0 +1,17 @@
+DOCKER_TAG=latest
+
+clean:
+	./gradlew clean
+test:
+	sh unit-tests.sh	
+functional-test:
+	sh functional-tests.sh
+jar-build:
+	docker run --rm \
+	-v $(CURDIR):/work \
+	-w=/work \
+	-e PARAMETER_SCRIPT_PATH=SyncGitRepos.groovy \
+	-e PARAMETER_OUTPUT_FILE=SyncGitRepos.jar \
+	devatherock/scriptjar:1.0.0
+docker-build:
+	docker build -t devatherock/git-sync:$(DOCKER_TAG) -f docker/Dockerfile .

SyncGitRepos.groovy

@@ -1,12 +1,12 @@
 @Grab(group = 'commons-cli', module = 'commons-cli', version = '1.4')
-@Grab(group = 'org.codehaus.groovy', module = 'groovy-cli-commons', version = '2.5.7')
-
-import groovy.transform.Field
-import groovy.cli.commons.CliBuilder
+@Grab(group = 'org.codehaus.groovy', module = 'groovy-cli-commons', version = '3.0.9')
 
+import java.util.function.Supplier
 import java.util.logging.Logger
 import java.util.regex.Pattern
-import java.util.function.Supplier
+
+import groovy.cli.commons.CliBuilder
+import groovy.transform.Field
 
 System.setProperty('java.util.logging.SimpleFormatter.format', '%5$s%n')
 @Field Logger logger = Logger.getLogger('SyncGitRepos.log')

build.gradle

@@ -1,20 +1,23 @@
 plugins {
     id 'groovy'
     id 'jacoco'
-    id 'com.github.kt3k.coveralls' version '2.10.2'
+    id 'com.github.kt3k.coveralls' version '2.12.2'
+    id 'com.diffplug.spotless' version '6.5.2'
 }
 
 repositories {
     mavenCentral()
 }
 
-sourceCompatibility = '1.6'
-targetCompatibility = '1.6'
+sourceCompatibility = '1.8'
+targetCompatibility = '1.8'
 
 dependencies {
-    implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.5.13'
+    def groovyVersion = '3.0.9'
 
-    testImplementation group: 'org.spockframework', name: 'spock-core', version: '1.3-groovy-2.5'
+    implementation group: 'org.codehaus.groovy', name: 'groovy-cli-commons', version: groovyVersion
+
+    testImplementation group: 'org.spockframework', name: 'spock-core', version: '2.3-groovy-3.0'
     testImplementation group: 'cglib', name: 'cglib-nodep', version: '3.3.0'
     testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.1'
 }
@@ -23,7 +26,14 @@ sourceSets {
     main {
         groovy {
             srcDirs = ['.']
-            exclude(['**/test/**', 'gradle/**', 'build/**', 'docker/**', 'bin/**', 'git-sync-test/**'])
+            exclude([
+                '**/test/**',
+                'gradle/**',
+                'build/**',
+                'docker/**',
+                'bin/**',
+                'git-sync-test/**'
+            ])
         }
     }
 }
@@ -32,6 +42,10 @@ compileGroovy {
     groovyOptions.configurationScript = file('gradle/config.groovy')
 }
 
+test {
+    useJUnitPlatform()
+}
+
 ext.jacoco = [
     exclusions: [
         'SyncGitRepos$_run_closure*'

gradle.properties

@@ -0,0 +1,2 @@
+org.gradle.daemon=false
+org.gradle.jvmargs=-Xmx1024m

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS=''
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew.bat

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

src/test/groovy/SyncGitReposSpec.groovy

@@ -1,11 +1,12 @@
-import io.github.devatherock.util.ProcessUtil
-import spock.lang.Specification
-import spock.lang.Unroll
-
 import java.util.logging.Handler
 import java.util.logging.LogRecord
 import java.util.logging.Logger
 
+import io.github.devatherock.util.ProcessUtil
+
+import spock.lang.Specification
+import spock.lang.Unroll
+
 /**
  * Test class for SyncGitRepos.groovy
  */

src/test/groovy/io/github/devatherock/gitsync/docker/SyncGitReposDockerSpec.groovy

@@ -1,6 +1,7 @@
 package io.github.devatherock.gitsync.docker
 
 import io.github.devatherock.util.ProcessUtil
+
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Unroll