From 0650b7688492e6a8a81f69602e20a0f486f9525f Mon Sep 17 00:00:00 2001 From: Camille Simon <43054281+camsim99@users.noreply.github.com> Date: Mon, 12 Feb 2024 15:26:18 -0800 Subject: [PATCH] Revert "Migrate integration_test plugin to Gradle Kotlin DSL (#142008)" (#143329) This reverts https://github.com/flutter/flutter/pull/142008 because it broke the Flutter --> packages roller. --- .../integration_test/android/build.gradle | 64 +++++++++++++++++++ .../integration_test/android/build.gradle.kts | 63 ------------------ .../{settings.gradle.kts => settings.gradle} | 2 +- 3 files changed, 65 insertions(+), 64 deletions(-) create mode 100644 packages/integration_test/android/build.gradle delete mode 100644 packages/integration_test/android/build.gradle.kts rename packages/integration_test/android/{settings.gradle.kts => settings.gradle} (81%) diff --git a/packages/integration_test/android/build.gradle b/packages/integration_test/android/build.gradle new file mode 100644 index 0000000000..c31e0fb81b --- /dev/null +++ b/packages/integration_test/android/build.gradle @@ -0,0 +1,64 @@ +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +group 'dev.flutter.plugins.integration_test' +version '1.0-SNAPSHOT' + +buildscript { + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:7.3.1' + } +} + +rootProject.allprojects { + repositories { + google() + mavenCentral() + } +} + +// project.getTasks().withType(JavaCompile){ +// options.compilerArgs << "-Xlint:all" << "-Werror" +// } + +apply plugin: 'com.android.library' + +android { + // Conditional for compatibility with AGP <4.2. + if (project.android.hasProperty("namespace")) { + namespace 'dev.flutter.integration_test' + } + + compileSdk 34 + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + defaultConfig { + minSdkVersion 21 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles 'lib-proguard-rules.txt' + } + + dependencies { + // TODO(egarciad): These dependencies should not be added to release builds. + // https://github.com/flutter/flutter/issues/56591 + testImplementation 'junit:junit:4.12' + testImplementation 'org.mockito:mockito-inline:5.0.0' + + // https://developer.android.com/jetpack/androidx/releases/test/#1.2.0 + api 'androidx.test:runner:1.2.0' + api 'androidx.test:rules:1.2.0' + api 'androidx.test.espresso:espresso-core:3.2.0' + + implementation 'com.google.guava:guava:28.1-android' + } +} diff --git a/packages/integration_test/android/build.gradle.kts b/packages/integration_test/android/build.gradle.kts deleted file mode 100644 index 6a671ade5c..0000000000 --- a/packages/integration_test/android/build.gradle.kts +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2014 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -group = "dev.flutter.plugins.integration_test" -version = "1.0-SNAPSHOT" - -buildscript { - repositories { - google() - mavenCentral() - } - - dependencies { - classpath("com.android.tools.build:gradle:7.3.1") - } -} - -plugins { - id("com.android.library") -} - -rootProject.allprojects { - repositories { - google() - mavenCentral() - } -} - -android { - // Conditional for compatibility with AGP <4.2. - if (project.findProject("android")?.hasProperty("namespace") == true) { - namespace = "dev.flutter.integration_test" - } - - namespace = "dev.flutter.integration_test" - compileSdk = 34 - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - - defaultConfig { - minSdk = 21 - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("lib-proguard-rules.txt") - } - - dependencies { - // TODO(egarciad): These dependencies should not be added to release builds. - // https://github.com/flutter/flutter/issues/56591 - testImplementation("junit:junit:4.12") - testImplementation("org.mockito:mockito-inline:5.0.0") - - // https://developer.android.com/jetpack/androidx/releases/test/#1.2.0 - api("androidx.test:runner:1.2.0") - api("androidx.test:rules:1.2.0") - api("androidx.test.espresso:espresso-core:3.2.0") - - implementation("com.google.guava:guava:28.1-android") - } -} diff --git a/packages/integration_test/android/settings.gradle.kts b/packages/integration_test/android/settings.gradle similarity index 81% rename from packages/integration_test/android/settings.gradle.kts rename to packages/integration_test/android/settings.gradle index af6ddb50da..29941fd33e 100644 --- a/packages/integration_test/android/settings.gradle.kts +++ b/packages/integration_test/android/settings.gradle @@ -2,4 +2,4 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -rootProject.name = "integrationTest" +rootProject.name = 'integrationTest'