From 4d208b529d7cdb2c5ce2c4b7896c8eb2d52c3a6f Mon Sep 17 00:00:00 2001 From: Ivan Gavrilovic Date: Fri, 29 Oct 2021 17:46:08 +0100 Subject: [PATCH] Kotlin Gradle plugin - Remove assertions from integration tests This is because AGP 3.4 and 3.6 have version of R8 that is unable to handle kotlin-stdlib 1.6+. Issue https://issuetracker.google.com/148661132 has more details on this. Instead of adding logic to remove assertions based on the AGP version, this change fully removes them to keep things simple. Also, running with assertions enabled may be too much for the integration tests. --- .../testProject/AndroidDaggerProject/gradle.properties | 2 +- .../testProject/AndroidExtensionsProject/gradle.properties | 2 +- .../AndroidExtensionsSpecificFeatures/gradle.properties | 2 +- .../AndroidKaptChangingDependencies/gradle.properties | 2 +- .../testProject/AndroidParcelizeProject/gradle.properties | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/gradle.properties index 8d895862864..186bc6f72a0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/gradle.properties @@ -1,2 +1,2 @@ -org.gradle.jvmargs=-ea -XX:MaxPermSize=512m +org.gradle.jvmargs=-XX:MaxPermSize=512m kapt.info.as.warnings=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/gradle.properties index 5fcc74643cf..59b261a6689 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/gradle.properties @@ -1 +1 @@ -org.gradle.jvmargs=-ea -XX:MaxPermSize=512m \ No newline at end of file +org.gradle.jvmargs=-XX:MaxPermSize=512m \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/gradle.properties index 5fcc74643cf..59b261a6689 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/gradle.properties @@ -1 +1 @@ -org.gradle.jvmargs=-ea -XX:MaxPermSize=512m \ No newline at end of file +org.gradle.jvmargs=-XX:MaxPermSize=512m \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidKaptChangingDependencies/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidKaptChangingDependencies/gradle.properties index 5fcc74643cf..59b261a6689 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidKaptChangingDependencies/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidKaptChangingDependencies/gradle.properties @@ -1 +1 @@ -org.gradle.jvmargs=-ea -XX:MaxPermSize=512m \ No newline at end of file +org.gradle.jvmargs=-XX:MaxPermSize=512m \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/gradle.properties index 5fcc74643cf..59b261a6689 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/gradle.properties @@ -1 +1 @@ -org.gradle.jvmargs=-ea -XX:MaxPermSize=512m \ No newline at end of file +org.gradle.jvmargs=-XX:MaxPermSize=512m \ No newline at end of file