Unverified Commit 0650b768 authored by Camille Simon's avatar Camille Simon Committed by GitHub

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.
parent 525cffd7
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
group = "dev.flutter.plugins.integration_test" group 'dev.flutter.plugins.integration_test'
version = "1.0-SNAPSHOT" version '1.0-SNAPSHOT'
buildscript { buildscript {
repositories { repositories {
...@@ -12,14 +12,10 @@ buildscript { ...@@ -12,14 +12,10 @@ buildscript {
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:7.3.1") classpath 'com.android.tools.build:gradle:7.3.1'
} }
} }
plugins {
id("com.android.library")
}
rootProject.allprojects { rootProject.allprojects {
repositories { repositories {
google() google()
...@@ -27,37 +23,42 @@ rootProject.allprojects { ...@@ -27,37 +23,42 @@ rootProject.allprojects {
} }
} }
// project.getTasks().withType(JavaCompile){
// options.compilerArgs << "-Xlint:all" << "-Werror"
// }
apply plugin: 'com.android.library'
android { android {
// Conditional for compatibility with AGP <4.2. // Conditional for compatibility with AGP <4.2.
if (project.findProject("android")?.hasProperty("namespace") == true) { if (project.android.hasProperty("namespace")) {
namespace = "dev.flutter.integration_test" namespace 'dev.flutter.integration_test'
} }
namespace = "dev.flutter.integration_test" compileSdk 34
compileSdk = 34
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
defaultConfig { defaultConfig {
minSdk = 21 minSdkVersion 21
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("lib-proguard-rules.txt") consumerProguardFiles 'lib-proguard-rules.txt'
} }
dependencies { dependencies {
// TODO(egarciad): These dependencies should not be added to release builds. // TODO(egarciad): These dependencies should not be added to release builds.
// https://github.com/flutter/flutter/issues/56591 // https://github.com/flutter/flutter/issues/56591
testImplementation("junit:junit:4.12") testImplementation 'junit:junit:4.12'
testImplementation("org.mockito:mockito-inline:5.0.0") testImplementation 'org.mockito:mockito-inline:5.0.0'
// https://developer.android.com/jetpack/androidx/releases/test/#1.2.0 // https://developer.android.com/jetpack/androidx/releases/test/#1.2.0
api("androidx.test:runner:1.2.0") api 'androidx.test:runner:1.2.0'
api("androidx.test:rules:1.2.0") api 'androidx.test:rules:1.2.0'
api("androidx.test.espresso:espresso-core:3.2.0") api 'androidx.test.espresso:espresso-core:3.2.0'
implementation("com.google.guava:guava:28.1-android") implementation 'com.google.guava:guava:28.1-android'
} }
} }
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
rootProject.name = "integrationTest" rootProject.name = 'integrationTest'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment