Merge pull request #236 from bugsnag/v5-fixture-dep-bump

Update test fixtures to run against AGP 4.1.0-beta04

.travis.yml

@@ -49,11 +49,34 @@ jobs:
     # AGP 3.4.0 E2E tests
     - name: AGP 3.4.0 E2E tests
       env:
-        - APP_FIXTURE_DIR=features/fixtures/app_agp340
-        - RN_FIXTURE_DIR=features/fixtures/rnapp_agp340/android
-        - NDK_FIXTURE_DIR=features/fixtures/ndkapp_agp340
-      script: bundle exec maze-runner features/agp3-features features/agp-features -c --verbose
+        - AGP_VERSION=3.4.0
+        - GRADLE_WRAPPER_VERSION=5.1.1
+      script: bundle exec maze-runner -c --verbose
 
-    # AGP 4.0.0 E2E tests
+      # AGP 3.5.0 E2E tests
+    - name: AGP 3.5.0 E2E tests
+      env:
+        - AGP_VERSION=3.5.0
+        - GRADLE_WRAPPER_VERSION=5.4.1
+      script: bundle exec maze-runner -c --verbose
+
+      # AGP 3.6.0 E2E tests
+    - name: AGP 3.6.0 E2E tests
+      env:
+        - AGP_VERSION=3.6.0
+        - GRADLE_WRAPPER_VERSION=5.6.4
+      script: bundle exec maze-runner -c --verbose
+
+      # AGP 4.0.0 E2E tests
     - name: AGP 4.0.0 E2E tests
-      script: bundle exec maze-runner features/agp4-features features/agp-features -c --verbose
+      env:
+        - AGP_VERSION=4.0.0
+        - GRADLE_WRAPPER_VERSION=6.1.1
+      script: bundle exec maze-runner -c --verbose
+
+    # AGP 4.1.0 E2E tests
+    - name: AGP 4.1.0 E2E tests
+      env:
+        - AGP_VERSION=4.1.0-beta04
+        - GRADLE_WRAPPER_VERSION=6.5.1
+      script: bundle exec maze-runner -c --verbose

CHANGELOG.md

@@ -14,6 +14,8 @@ Alter bugsnag extension to allow multiple shared object paths
 
 Support for manifest processing in AGP 4.1.0-alpha04 and above
 [#234](https://github.com/bugsnag/bugsnag-android-gradle-plugin/pull/234)
+[#236](https://github.com/bugsnag/bugsnag-android-gradle-plugin/pull/236)
+[#240](https://github.com/bugsnag/bugsnag-android-gradle-plugin/pull/240)
 
 Alter bugsnag tasks to support the Incremental Build API
 [#230](https://github.com/bugsnag/bugsnag-android-gradle-plugin/pull/230)

features/agp-features/abi_apk_splits.feature → features/abi_apk_splits.feature

@@ -1,5 +1,6 @@
 Feature: Plugin integrated in project with ABI APK splits
 
+@skip_agp4_1_or_higher
 Scenario: ABI Splits project builds successfully
     When I build "abi_splits" using the "standard" bugsnag config
     Then I should receive 16 requests
@@ -57,10 +58,12 @@ Scenario: ABI Splits project builds successfully
     And the field "versionName" for multipart request 0 equals "1.0"
     And the field "appId" for multipart request 0 equals "com.bugsnag.android.example"
 
+@skip_agp4_1_or_higher
 Scenario: ABI Splits automatic upload disabled
     When I build "abi_splits" using the "all_disabled" bugsnag config
     Then I should receive no requests
 
+@skip_agp4_1_or_higher
 Scenario: ABI Splits manual upload of build API
     When I build the "Armeabi-release" variantOutput for "abi_splits" using the "all_disabled" bugsnag config
     Then I should receive 1 request

features/agp-features/density_abi_splits.feature → features/density_abi_splits.feature

@@ -1,5 +1,6 @@
 Feature: Plugin integrated in project with Density + ABI APK splits
 
+@skip_agp4_1_or_higher
 Scenario: Density ABI Splits project builds successfully
     When I build "density_abi_splits" using the "standard" bugsnag config
     Then I should receive 26 requests
@@ -82,10 +83,12 @@ Scenario: Density ABI Splits project builds successfully
     And the request 0 is valid for the Android Mapping API
     And the field "versionCode" for multipart request 0 equals "53"
 
+@skip_agp4_1_or_higher
 Scenario: Density ABI Splits automatic upload disabled
     When I build "density_abi_splits" using the "all_disabled" bugsnag config
     Then I should receive no requests
 
+@skip_agp4_1_or_higher
 Scenario: Density ABI Splits manual upload of build API
     When I build the "XxxhdpiArmeabi-release" variantOutput for "density_abi_splits" using the "all_disabled" bugsnag config
     Then I should receive 1 request

features/agp-features/density_splits.feature → features/density_splits.feature

@@ -1,5 +1,6 @@
 Feature: Plugin integrated in project with Density APK splits
 
+@skip_agp4_1_or_higher
 Scenario: Density Splits project builds successfully
     When I build "density_splits" using the "standard" bugsnag config
     Then I should receive 14 requests
@@ -51,10 +52,12 @@ Scenario: Density Splits project builds successfully
     And the field "versionName" for multipart request 0 equals "1.0"
     And the field "appId" for multipart request 0 equals "com.bugsnag.android.example"
 
+@skip_agp4_1_or_higher
 Scenario: Density Splits automatic upload disabled
     When I build "density_splits" using the "all_disabled" bugsnag config
     Then I should receive no requests
 
+@skip_agp4_1_or_higher
 Scenario: Density Splits manual upload of build API
     When I build the "Hdpi-release" variantOutput for "density_splits" using the "all_disabled" bugsnag config
     Then I should receive 1 request

features/fixtures/app/build.gradle

@@ -3,11 +3,19 @@
 buildscript {
 
     repositories {
+        mavenLocal()
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        def agpVersion = System.env.AGP_VERSION ?: "4.1.0-beta04"
+        classpath "com.android.tools.build:gradle:${agpVersion}"
+
+        if (!System.env.UPDATING_GRADLEW) {
+            dependencies {
+                classpath "com.bugsnag:bugsnag-android-gradle-plugin:9000.0.0-test"
+            }
+        }
     }
 }
 

features/fixtures/app/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=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

features/fixtures/app/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=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

features/fixtures/app/module/build.gradle

@@ -1,19 +1,13 @@
-buildscript {
-    repositories {
-        jcenter()
-        google()
-        mavenLocal()
-    }
-    dependencies {
-        classpath "com.bugsnag:bugsnag-android-gradle-plugin:${project.plugin_version}"
-    }
-}
+def moduleConfig = System.env.MODULE_CONFIG ?: "default_app"
+def bugsnagConfig = System.env.BUGSNAG_CONFIG ?: "standard"
 
 // apply android module configuration (e.g. APK splits enabled)
-apply from: "config/android/${System.env.MODULE_CONFIG}.gradle"
+apply from: "../../config/android/${moduleConfig}.gradle"
 
-// apply config first (not overwritten by applying bugsnag plugin)
-apply from: "config/bugsnag/${System.env.BUGSNAG_CONFIG}.gradle"
+if (!System.env.UPDATING_GRADLEW) {
+    // apply config first (not overwritten by applying bugsnag plugin)
+    apply from: "../../config/bugsnag/${bugsnagConfig}.gradle"
 
-// apply bugsnag plugin configuration (e.g. custom sourceControl info)
-apply plugin: 'com.bugsnag.android.gradle'
+    // apply bugsnag plugin configuration (e.g. custom sourceControl info)
+    apply plugin: 'com.bugsnag.android.gradle'
+}