Skip to content

Commit

Permalink
Revert dependency changes (#904)
Browse files Browse the repository at this point in the history
* Revert "Bring grpc back to 1.50.2 after PR 884"

This reverts commit b634eef.

* Revert "Update dependencies (#884)"

This reverts commit 8800399.
  • Loading branch information
berikv authored Mar 15, 2023
1 parent 2498ccd commit cf4ebf7
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 25 deletions.
8 changes: 8 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ plugins {
alias(libs.plugins.detekt)
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

detekt {
buildUponDefaultConfig = true
allRules = false
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/android-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
jvmTarget = '1.8'
useIR = true
}
buildFeatures {
Expand Down
5 changes: 1 addition & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
org.gradle.jvmargs=-Xmx2000m
org.gradle.parallel=true
# android & kotlin
android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official
# maestro specific
GROUP=dev.mobile
VERSION_NAME=1.25.0
POM_DESCRIPTION=Maestro is a server-driven platform-agnostic library that allows to drive tests for both iOS and Android using the same implementation through an intuitive API.
Expand All @@ -18,3 +14,4 @@ POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=mobile-dev-inc
POM_DEVELOPER_NAME=mobile.dev inc.
SONATYPE_STAGING_PROFILE=dev.mobile
org.gradle.jvmargs=-Xmx2000m
28 changes: 14 additions & 14 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,41 +7,41 @@
androidPlugin = "4.2.1"
androidToolsApkParser = "30.3.0"
androidToolsSdk = "30.3.0"
androidxAppcompat = "1.6.1"
androidxAppcompat = "1.5.1"
androidxConstraintlayout = "2.1.4"
androidxCore = "1.9.0"
androidxEspresso = "3.5.1"
androidxTestJunit = "1.1.5"
androidxEspresso = "3.4.0"
androidxTestJunit = "1.1.3"
androidxUiautomator = "2.2.0"
apkParser = "2.6.10"
appdirs = "1.2.1"
axml = "2.1.2"
dadb = "1.2.6"
detekt = "1.22.0"
detekt = "1.19.0"
googleAndroidMaterial = "1.6.0"
googleFindbugs = "3.0.2"
googleGson = "2.10.1"
googleGson = "2.9.0"
googleProtobuf = "3.21.9"
googleProtobufKotlinLite = "3.21.9"
googleProtobufPlugin = "0.9.1"
googleTruth = "1.1.3"
grpc = "1.50.2"
grpcKotlinStub = "1.3.0"
imageComparison = "4.4.0"
jackson = "2.14.2"
jackson = "2.13.4"
jansi = "2.4.0"
jarchivelib = "1.2.0"
junit = "5.9.2"
kotlin = "1.8.10"
junit = "5.9.0"
kotlin = "1.6.10"
kotlinResult = "1.1.14"
ktor = "2.2.4"
ktor = "2.2.2"
mozillaRhino = "1.7.14"
picocli = "4.7.1"
selenium = "4.8.1"
picocli = "4.5.2"
selenium = "4.7.2"
slf4j = "1.7.36"
slf4jNop = "2.0.6"
slf4jNop = "2.0.1"
squareOkhttp = "4.10.0"
squareOkio = "3.3.0"
squareOkio = "3.2.0"
squareRetrofit = "2.9.0"
webdrivermanager = "5.3.1"
wiremock = "2.35.0"
Expand Down Expand Up @@ -73,7 +73,7 @@ grpc-okhttp = { module = "io.grpc:grpc-okhttp", version.ref = "grpc" }
grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }
grpc-protobuf-kotlin = { module = "io.grpc:grpc-protobuf-kotlin", version.ref = "grpc" }
grpc-protobuf-lite = { module = "io.grpc:grpc-protobuf-lite", version.ref = "grpc" }
grpc-protoc-gen-java = { module = "io.grpc:protoc-gen-grpc-java", version.ref = "grpc" }
grpc-protoc-gen-java = { module = "io.grpc:protoc-gen-grpc-java", version.ref = "grpc"}
grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
image-comparison = { module = "com.github.romankh3:image-comparison", version.ref = "imageComparison" }
jackson-core-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
Expand Down
4 changes: 2 additions & 2 deletions maestro-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
jvmTarget = '1.8'
}
packagingOptions {
resources {
Expand Down Expand Up @@ -107,7 +107,7 @@ tasks.register("copyMaestroServer", Copy) {
if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
throw new GradleException("This build must be run with java 8")
}

if (!layout.buildDirectory.file(maestroServerApkDestPath).get().asFile.exists())
throw new GradleException("Error: Input source for copyMaestroServer doesn't exist")

Expand Down
2 changes: 1 addition & 1 deletion maestro-sdk/android-playground/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
jvmTarget = '1.8'
}
}

Expand Down
3 changes: 0 additions & 3 deletions maestro-sdk/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
}

plugins.withId("com.vanniktech.maven.publish") {
Expand Down

0 comments on commit cf4ebf7

Please sign in to comment.