Merge pull request #1724 from ctrimble/feature_update-examples

Update maven and gradle examples

Author: ctrimble

.github/dependabot.yml

@@ -3,10 +3,6 @@
 
 version: 2
 updates:
-  - package-ecosystem: "gradle" # See documentation for possible values
-    directory: "jsonschema2pojo-gradle-plugin/example/android"
-    schedule:
-      interval: "monthly"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
@@ -15,3 +11,19 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+  - package-ecosystem: "gradle"
+    directory: "/jsonschema2pojo-gradle-plugin"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "gradle"
+    directory: "/jsonschema2pojo-gradle-plugin/example/android"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "gradle"
+    directory: "/jsonschema2pojo-gradle-plugin/example/java"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "maven"
+    directory: "/jsonschema2pojo-maven-plugin/example"
+    schedule:
+      interval: "monthly"

.github/workflows/android-ci.yml

@@ -11,21 +11,27 @@ on:
 
 jobs:
   buildTest:
-    name: Build JDK ${{ matrix.java_version }}
+    name: JDK ${{ matrix.version.java }} | Example Gradle (Android)
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java_version: [8]
+        version:
+          - { java: 8,  gradle: '7.6.4' }  # AGP Java 8 => Gradle 7.6.4 (MavenPlugin legacy)
     steps:
       - name: Setup Maven Action
         uses: s4u/[email protected]
         with:
           checkout-fetch-depth: 0
-          java-version: ${{ matrix.java_version }}
+          java-version: ${{ matrix.version.java }}
           java-distribution: temurin
       - name: Install Android SDK
         uses: malinskiy/action-android/install-sdk@release/0.1.1
       - name: Install latest jsonschema2pojo SNAPSHOT
         run: ./mvnw -U -B install -DskipTests -Dmaven.javadoc.skip -Dmaven.site.skip
-      - name: Build projects
-        run: cd jsonschema2pojo-gradle-plugin/example/android && ./gradlew --info assembleDebug
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: ${{ matrix.version.gradle }}
+      - name: Build Gradle example (Android)
+        working-directory: jsonschema2pojo-gradle-plugin/example/android
+        run: gradle --warning-mode all --info assembleDebug

jsonschema2pojo-gradle-plugin/example/android/README.md

@@ -1 +1,3 @@
-# Simply open it with Android Studio
+# Simply open it with Android Studio
+
+Note: `gradlew` in this example requires JDK 17+.

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

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