Remove support for Android Gradle plugin 4.2 (closes #787)

chaquo · Jul 20, 2023 · 95bd633 · 95bd633
1 parent 937e516
commit 95bd633
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 85 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -72,12 +72,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # We pin specific OS versions, because we need them to be compatible with the
-        # Python `extra-versions` listed below.
         agp-version: ${{ fromJSON(needs.build-product.outputs.agp-versions) }}
-        os: [macos-12, ubuntu-20.04, windows-2022]
-
-    runs-on: ${{ matrix.os }}
+        os: [linux, macos, windows]
+        include:
+          # We pin specific OS versions to ensure that the Python `extra-versions`
+          # listed below are all available. To avoid clutter in the GitHub UI, OS
+          # versions are not added to the `os` dimension directly.
+          - os: linux
+            runs-on: ubuntu-20.04
+          - os: macos
+            runs-on: macos-12
+          - os: windows
+            runs-on: windows-2022
+
+    runs-on: ${{ matrix.runs-on }}
     steps:
       - uses: actions/checkout@v3.5.3
 

diff --git a/product/gradle-plugin/src/main/groovy/com/chaquo/python/PythonPlugin.groovy b/product/gradle-plugin/src/main/groovy/com/chaquo/python/PythonPlugin.groovy
@@ -22,7 +22,7 @@ import static java.nio.file.StandardCopyOption.*
 class PythonPlugin implements Plugin<Project> {
     static final def NAME = "python"
     static final def PLUGIN_VERSION = PythonPlugin.class.package.implementationVersion
-    static final def MIN_ANDROID_PLUGIN_VER = VersionNumber.parse("4.2.0")
+    static final def MIN_ANDROID_PLUGIN_VER = VersionNumber.parse("7.0.0")
 
     Project project
     ScriptHandler buildscript

diff --git a/product/gradle-plugin/src/test/integration/data/AndroidPlugin/old/app/build.gradle b/product/gradle-plugin/src/test/integration/data/AndroidPlugin/old/app/build.gradle
diff --git a/...radle-plugin/src/test/integration/data/AndroidPlugin/old/app/src/main/AndroidManifest.xml b/...radle-plugin/src/test/integration/data/AndroidPlugin/old/app/src/main/AndroidManifest.xml
diff --git a/product/gradle-plugin/src/test/integration/data/AndroidPlugin/old/gradle.properties b/product/gradle-plugin/src/test/integration/data/AndroidPlugin/old/gradle.properties
@@ -1,7 +1,7 @@
 # The test script uses this to set JAVA_HOME.
-chaquopy.java.version=8
+chaquopy.java.version=11
 
-agpVersion=4.1.3
+agpVersion=4.2.2
 
 # These variables will be filled in by the test script.
 chaquopyRepository=

diff --git a/...ugin/src/test/integration/data/AndroidPlugin/old/gradle/wrapper/gradle-wrapper.properties b/...ugin/src/test/integration/data/AndroidPlugin/old/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/product/gradle-plugin/src/test/integration/data/base-4.2/build.gradle b/product/gradle-plugin/src/test/integration/data/base-4.2/build.gradle
diff --git a/product/gradle-plugin/src/test/integration/data/base-4.2/gradle.properties b/product/gradle-plugin/src/test/integration/data/base-4.2/gradle.properties
diff --git a/...gradle-plugin/src/test/integration/data/base-4.2/gradle/wrapper/gradle-wrapper.properties b/...gradle-plugin/src/test/integration/data/base-4.2/gradle/wrapper/gradle-wrapper.properties
diff --git a/product/gradle-plugin/src/test/integration/data/base-4.2/settings.gradle b/product/gradle-plugin/src/test/integration/data/base-4.2/settings.gradle
diff --git a/product/gradle-plugin/src/test/integration/test_gradle_plugin.py b/product/gradle-plugin/src/test/integration/test_gradle_plugin.py
@@ -253,7 +253,7 @@ def test_misordered(self):
 
     def test_old(self):  # Also tests making a change
         MESSAGE = ("This version of Chaquopy requires Android Gradle plugin version "
-                   "4.2.0 or later")
+                   "7.0.0 or later")
         run = self.RunGradle("base", "AndroidPlugin/old", succeed=False)
         self.assertInLong(f"{MESSAGE}: {self.ADVICE}", run.stderr)
 

diff --git a/product/runtime/docs/sphinx/android.rst b/product/runtime/docs/sphinx/android.rst
@@ -7,7 +7,7 @@ Chaquopy is distributed as a plugin for Android's Gradle-based build system. It
 any app which meets the following requirements:
 
 * In your project's top-level `build.gradle` file, the Android Gradle plugin version
-  should be between 4.2 and 8.0. Older versions as far back as 2.2 are supported by
+  should be between 7.0 and 8.1. Older versions as far back as 2.2 are supported by
   :doc:`older versions of Chaquopy <../versions>`.
 
   * The Android plugin may be listed as `com.android.application`, `com.android.library` or

diff --git a/product/runtime/docs/sphinx/versions.rst b/product/runtime/docs/sphinx/versions.rst
@@ -9,7 +9,7 @@ Version summary
 |                   |                   |Gradle plugin      |level              |
 |                   |                   |versions           |                   |
 +===================+===================+===================+===================+
-|15.0               |                   |4.2 - 8.0          |                   |
+|15.0               |                   |7.0 - 8.1          |                   |
 +-------------------+                   +-------------------+                   +
 |14.0               |                   |4.1 - 8.0          |                   |
 +-------------------+                   +-------------------+                   +