Test on all Java LTS

.github/workflows/android-ci.yml

@@ -13,17 +13,22 @@ jobs:
  buildTest:
  name: Build JDK ${{ matrix.java_version }}
  runs-on: ubuntu-latest
+ continue-on-error: true
  strategy:
  matrix:
- java_version: [8]
+ # Gradle 7 removed maven plugin, but the latest Android plugin compatible with Java 8 need it
+ # so we can't test Android on Java 8 with Gradle 7+
+ # https://docs.gradle.org/7.0/userguide/upgrading_version_6.html#removal_of_the_legacy_maven_plugin
+ # https://mvnrepository.com/artifact/com.android.tools.build/gradle
+ java_version: [11, 17, 21]
  steps:
- - name: Setup Maven Action
- uses: s4u/setup-maven-action@v1.8.0
+ - uses: actions/checkout@v4
  with:
- checkout-fetch-depth: 0
+ fetch-depth: 0
+ - uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
  java-version: ${{ matrix.java_version }}
- java-distribution: temurin
- maven-version: 3.8.7
  - name: Install Android SDK
  uses: malinskiy/action-android/install-sdk@release/0.1.1
  - name: Install latest jsonschema2pojo SNAPSHOT

.github/workflows/ci.yml

@@ -13,18 +13,19 @@ on:
 jobs:
  test:
  runs-on: ubuntu-latest
+ continue-on-error: true
  strategy:
  matrix:
- java_version: [8]
+ java_version: [8, 11, 17, 21]
  max-parallel: 4
  name: Test JDK ${{ matrix.java_version }}
  steps:
- - name: Setup Maven Action
- uses: s4u/setup-maven-action@v1.8.0
+ - uses: actions/checkout@v4
  with:
- checkout-fetch-depth: 0
+ fetch-depth: 0
+ - uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
  java-version: ${{ matrix.java_version }}
- java-distribution: temurin
- maven-version: 3.8.7
  - name: Verify with Maven
- run: mvn verify -B
+ run: ./mvnw verify -B

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip

jsonschema2pojo-gradle-plugin/example/android/app/build.gradle

@@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
 apply plugin: 'jsonschema2pojo'
 
 android {
- compileSdkVersion 30
-
  defaultConfig {
+ namespace "jsonschema2pojo.joelittlejohn.github.com.androidexample"
  applicationId "jsonschema2pojo.joelittlejohn.github.com.androidexample"
  minSdkVersion 26
+ compileSdkVersion 30
  targetSdkVersion 30
  versionCode 1
  versionName "1.0"

jsonschema2pojo-gradle-plugin/example/android/build.gradle

@@ -5,7 +5,14 @@ buildscript {
  mavenCentral()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:4.2.2'
+ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+ classpath 'com.android.tools.build:gradle:8.5.2'
+ } else if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
+ classpath 'com.android.tools.build:gradle:7.4.2'
+ } else {
+ classpath 'com.android.tools.build:gradle:4.2.2'
+ }
+
  classpath 'org.jsonschema2pojo:jsonschema2pojo-gradle-plugin:latest.integration'
  }
 }

jsonschema2pojo-gradle-plugin/example/android/gradle/wrapper/gradle-wrapper.properties

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

jsonschema2pojo-gradle-plugin/example/android/lib/build.gradle

@@ -3,10 +3,10 @@ apply plugin: 'jsonschema2pojo'
 
 
 android {
- compileSdkVersion 30
-
  defaultConfig {
+ namespace "jsonschema2pojo.joelittlejohn.github.com.androidlibexample"
  minSdkVersion 26
+ compileSdkVersion 30
  targetSdkVersion 30
  versionCode 1
  versionName "1.0"

jsonschema2pojo-gradle-plugin/example/android/libMoshi/build.gradle

@@ -3,10 +3,10 @@ apply plugin: 'jsonschema2pojo'
 
 
 android {
- compileSdkVersion 30
-
  defaultConfig {
+ namespace "jsonschema2pojo.joelittlejohn.github.com.androidlibexample"
  minSdkVersion 26
+ compileSdkVersion 30
  targetSdkVersion 30
  versionCode 1
  versionName "1.0"

jsonschema2pojo-gradle-plugin/example/java/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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jsonschema2pojo-gradle-plugin/example/java/gradlew

@@ -82,7 +82,6 @@ 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
@@ -130,7 +129,6 @@ 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
@@ -156,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
  else
  eval `echo args$i`="\"$arg\""
  fi
- i=`expr $i + 1`
+ i=$((i+1))
  done
  case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
  esac
 fi
 
@@ -177,9 +175,14 @@ save () {
  for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
  echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"

jsonschema2pojo-gradle-plugin/example/java/gradlew.bat

@@ -29,9 +29,6 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @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" "-Xms64m"
 
@@ -40,7 +37,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +51,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +61,28 @@ 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 %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

jsonschema2pojo-gradle-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists