Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Android Gradle Plugin 7.2.1 #2

Merged
merged 1 commit into from
Jul 19, 2022
Merged

Upgrade to Android Gradle Plugin 7.2.1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion buildSrc/src/main/groovy/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ ext {
// Build and upload with:
// ./gradlew clean assemble publish --no-daemon --no-parallel
gradleMavenPublishPlugin : 'com.vanniktech:gradle-maven-publish-plugin:0.18.0',
androidPlugin : 'com.android.tools.build:gradle:4.2.0',
androidPlugin : 'com.android.tools.build:gradle:7.2.1',
nexusPlugin : 'com.bmuschko:gradle-nexus-plugin:2.3.1',
builderTestApi : 'com.android.tools.build:builder-test-api:7.2.1',
toolsCommon : 'com.android.tools:common:30.2.1',
commonsIo : 'commons-io:commons-io:2.11.0',
appcompat : "androidx.appcompat:appcompat:1.4.1",
androidXAnnotations : "androidx.annotation:annotation:1.3.0",
guava : "com.google.guava:guava:31.0.1-android",
Expand Down
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Wed Jul 13 13:40:38 EDT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-all.zip
zipStoreBase=GRADLE_USER_HOME
6 changes: 3 additions & 3 deletions okreplay-espresso/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = JavaVersion.VERSION_11
}
}

Expand Down
8 changes: 4 additions & 4 deletions okreplay-gradle-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ apply plugin: 'org.jetbrains.kotlin.jvm'
apply plugin: 'java-gradle-plugin'
apply plugin: 'com.vanniktech.maven.publish'

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

dependencies {
compileOnly gradleApi()
compileOnly dep.androidPlugin
compileOnly dep.ddmlib
implementation dep.kotlinStdLib
implementation dep.builderTestApi
implementation dep.toolsCommon
implementation dep.commonsIo
testImplementation gradleTestKit()
testImplementation dep.androidPlugin
testImplementation dep.ddmlib
Expand All @@ -23,6 +23,6 @@ test {
testLogging.showStandardStreams = isCi
}

validateTaskProperties {
validatePlugins {
failOnWarning = true
}
2 changes: 1 addition & 1 deletion okreplay-gradle-plugin/src/main/kotlin/okreplay/DeviceBridge.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ internal interface DeviceBridge {
}

internal class RealDeviceBridge(adbPath: File, adbTimeoutMs: Int, private val logger: Logger) : DeviceBridge {
private val deviceProvider = ConnectedDeviceProvider(adbPath, adbTimeoutMs, LoggerWrapper(logger))
private val deviceProvider = ConnectedDeviceProvider(adbPath, adbTimeoutMs, LoggerWrapper(logger), null)

override fun use(block: DeviceBridge.() -> Unit) {
try {
Expand Down
4 changes: 2 additions & 2 deletions okreplay-gradle-plugin/src/test/testProject/android/buildScriptFixtures/basic.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext.VERSION_NAME='1.5.0-SNAPSHOT'
apply from: "../../../../gradle/dependencies.gradle"
apply from: "../../../../buildSrc/src/main/groovy/dependencies.gradle"
repositories {
jcenter()
google()
Expand Down Expand Up @@ -33,4 +33,4 @@ repositories {

dependencies {
implementation dep.appcompat
}
}
6 changes: 3 additions & 3 deletions okreplay-sample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = JavaVersion.VERSION_11
}

useLibrary 'android.test.runner'
Expand Down
8 changes: 4 additions & 4 deletions okreplay-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = JavaVersion.VERSION_11
}
}

Expand All @@ -40,4 +40,4 @@ dependencies {
testImplementation dep.mockWebServer
}

apply from: "$rootDir/gradle/checkstyle.gradle"
apply from: "$rootDir/gradle/checkstyle.gradle"