Updated to new gradle packages and new gradle.

Updated main workflow and makefile.

Author: manastalukdar

CHANGELOG.md

@@ -23,6 +23,8 @@ The format is based on [Keep a Changelog][Keep a Changelog], and this project ad
 - Updated workflow for gitmodules for all jobs.
 - Added `--remote` `--merge` to submodule update in workflow.
 - Updated build scripts.
+- Updated to new gradle packages and new gradle.
+- Updated main workflow and makefile.
 
 ## [0.0.3] - 2021-01-05
 

static-to-copy/.github/workflows/main.yml

@@ -17,8 +17,8 @@ jobs:
           java-version: '15.0.0'
           architecture: x64
       - run: java -version
-      - name: Make javacode
-        run: make javacode
+      - name: Make java-code
+        run: make java-code
   build-pythoncode:
     name: pythoncode
     runs-on: ${{ matrix.os }}
@@ -36,8 +36,8 @@ jobs:
           architecture: 'x64'
       - run: python --version
       - run: pip install -r requirements.txt
-      - name: Make pythoncode
-        run: make pythoncode
+      - name: Make python-code
+        run: make python-code
   build-csharpcode:
     name: csharpcode
     runs-on: ${{ matrix.os }}
@@ -57,5 +57,5 @@ jobs:
           python-version: '3.9'
           architecture: 'x64'
       - run: dotnet --version
-      - name: Make csharpcode
-        run: make csharpcode
+      - name: Make csharp-code
+        run: make csharp-code

static-to-copy/Makefile

@@ -13,64 +13,84 @@ endif
 # Java code tasks
 #*****************
 
-javadependencies:
+java-dependencies:
 	${workspaceFolder}${gradlewScript} dependencies
 
-javabuild:
+java-build:
 	${workspaceFolder}${gradlewScript} build
 
-javatest:
+java-test:
 	${workspaceFolder}${gradlewScript} test
 
-javaclean:
+java-clean:
 	${workspaceFolder}${gradlewScript} clean
 
-javatestcoverage:
+java-test-coverage:
 	${workspaceFolder}${gradlewScript} test jacocoJupTestReport
 
-javacode: javadependencies javaclean javatestcoverage
+java-code: java-dependencies java-clean java-test-coverage
 
 #*****************
 # C# code tasks
 #*****************
 
-xunittests:
+csharp-xunit-tests:
 	python ${workspaceFolder}scripts/run_xunit_tests.py
 
-csharpcode: xunittests
+csharp-code: csharp-xunit-tests
 
 #*******************
 # Python code tasks
 #*******************
 
-pythonrequirements:
+python-requirements:
 	pip install -r requirements.txt
 
-pythontests:
+python-tests:
 	python ${workspaceFolder}scripts/run_unit_tests.py
 
-pythontestcoverage:
+python-test-coverage:
 	coverage run ${workspaceFolder}scripts/run_unit_tests.py
 
-pythoncode: pythontestcoverage
+python-code: python-test-coverage
 
 #*****************
 # Project tasks
 #*****************
 
-getproblemscount:
+get-problems-count:
 	python ${workspaceFolder}scripts/get_problems_count.py
 
-get-git-submodules:
-	git submodule update --init --recursive --remote --merge
+#*****************
+# Git tasks
+#*****************
+
+git-version:
+	git --version
+
+git-upgrade-ubuntu:
+	sudo apt-get install software-properties-common
+	sudo add-apt-repository ppa:git-core/ppa -y
+	sudo apt-get update
+	sudo apt-get upgrade
+	sudo apt-get install git -y
+	git --version
+
+git-submodules-setup:
+	git submodule sync --recursive
+	git submodule foreach --recursive git fetch
+	git submodule foreach git pull
+
+git-get-submodules:
+	git submodule update --init --recursive --remote --rebase
 
 #*****************
 # All tasks
 #*****************
 
-git: get-git-submodules
+git: git-version git-get-submodules
 
-code: javacode pythoncode csharpcode
+code: java-code python-code csharp-code
 
-all: git getproblemscount code
+all: git get-problems-count code
 

static-to-copy/build.gradle

@@ -7,12 +7,12 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
+        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3'
     }
 }
 
 plugins {
-  id "org.sonarqube" version "2.6"
+  id "org.sonarqube" version "3.0"
 }
 
 repositories { 
@@ -23,11 +23,11 @@ repositories {
     mavenCentral()
 }
 
-ext.junit4Version        = '4.12'
+ext.junit4Version        = '4.13.1'
 ext.junitVintageVersion  = '4.12.1'
 ext.junitPlatformVersion = '1.5.2'
-ext.junitJupiterVersion  = '5.5.2'
-ext.log4jVersion         = '2.9.0'
+ext.junitJupiterVersion  = '5.7.0'
+ext.log4jVersion         = '2.14.0'
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
@@ -98,7 +98,7 @@ dependencies {
 	//testRuntimeOnly("org.junit.platform:junit-platform-launcher:${junitPlatformVersion}")
 
 	// To avoid compiler warnings about @API annotations in JUnit code
-	testCompileOnly('org.apiguardian:apiguardian-api:1.0.0')
+	testCompileOnly('org.apiguardian:apiguardian-api:1.1.1')
     implementation('org.apiguardian:apiguardian-api:1.0.0')
 
     // To use Log4J's LogManager

static-to-copy/gradle/wrapper/gradle-wrapper.jar

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

static-to-copy/gradle/wrapper/gradle-wrapper.properties

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

static-to-copy/gradlew

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell