diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3a9d81e2a..422c76b7b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,10 @@
-
-
+
+
+
+
\ No newline at end of file
diff --git a/adam/build.gradle.kts b/adam/build.gradle.kts
index e990a7e25..062824278 100644
--- a/adam/build.gradle.kts
+++ b/adam/build.gradle.kts
@@ -1,3 +1,6 @@
+import com.google.protobuf.gradle.id
+import com.google.protobuf.gradle.remove
+
/*
* Copyright (C) 2021 Anton Malinskiy
*
@@ -14,14 +17,6 @@
* limitations under the License.
*/
-import com.google.protobuf.gradle.builtins
-import com.google.protobuf.gradle.generateProtoTasks
-import com.google.protobuf.gradle.id
-import com.google.protobuf.gradle.plugins
-import com.google.protobuf.gradle.protobuf
-import com.google.protobuf.gradle.protoc
-import com.google.protobuf.gradle.remove
-
plugins {
kotlin("jvm")
id("jacoco")
@@ -109,7 +104,7 @@ val jacocoIntegrationTestReport = task("jacocoIntegrationTestRepor
description = "Generates code coverage report for integrationTest task"
group = "verification"
reports {
- xml.isEnabled = true
+ xml.required.set(true)
}
executionData(integrationTest)
@@ -130,7 +125,7 @@ val jacocoCombinedTestReport = task("jacocoCombinedTestReport") {
tasks.jacocoTestReport {
reports {
- xml.isEnabled = true
+ xml.required.set(true)
}
}
@@ -146,7 +141,7 @@ java {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.apiVersion = "1.5"
- kotlinOptions.languageVersion = "1.5"
+ kotlinOptions.languageVersion = "1.8"
}
dependencies {
diff --git a/adam/src/integrationTest/kotlin/com/malinskiy/adam/integration/LogcatE2ETest.kt b/adam/src/integrationTest/kotlin/com/malinskiy/adam/integration/LogcatE2ETest.kt
index 795b73692..3d0260c22 100644
--- a/adam/src/integrationTest/kotlin/com/malinskiy/adam/integration/LogcatE2ETest.kt
+++ b/adam/src/integrationTest/kotlin/com/malinskiy/adam/integration/LogcatE2ETest.kt
@@ -22,9 +22,11 @@ import com.malinskiy.adam.request.logcat.SyncLogcatRequest
import com.malinskiy.adam.request.prop.GetSinglePropRequest
import com.malinskiy.adam.request.shell.v1.ShellCommandRequest
import com.malinskiy.adam.rule.AdbDeviceRule
+import kotlinx.coroutines.Deferred
import kotlinx.coroutines.async
import kotlinx.coroutines.debug.junit4.CoroutinesTimeout
import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
import kotlinx.coroutines.runBlocking
import org.hamcrest.CoreMatchers.equalTo
import org.hamcrest.MatcherAssert.assertThat
@@ -94,9 +96,10 @@ class LogcatE2ETest {
val content = mutableSetOf()
val channel = adb.adb.execute(request, this, adb.deviceSerial)
- async {
- delay(100)
- for (i in 1..10) {
+
+ val background: Deferred = async {
+ while (isActive) {
+ delay(100)
//Produce artificial message in logcat
adb.adb.execute(ShellCommandRequest("log -t TEST_TAG \"Test message\""), adb.deviceSerial)
}
@@ -112,6 +115,7 @@ class LogcatE2ETest {
delay(100)
}
channel.cancel()
+ background.cancel()
val zonedInstant = nowInstant.atZone(deviceTimezone.toZoneId()).minusSeconds(5)
assertThat(content.all { it.instant.isAfter(zonedInstant) }, equalTo(true))
diff --git a/adam/src/integrationTest/kotlin/com/malinskiy/adam/rule/AdbDeviceRule.kt b/adam/src/integrationTest/kotlin/com/malinskiy/adam/rule/AdbDeviceRule.kt
index 7546ebb53..ea6898a0b 100644
--- a/adam/src/integrationTest/kotlin/com/malinskiy/adam/rule/AdbDeviceRule.kt
+++ b/adam/src/integrationTest/kotlin/com/malinskiy/adam/rule/AdbDeviceRule.kt
@@ -83,6 +83,8 @@ class AdbDeviceRule(val deviceType: DeviceType = DeviceType.ANY, vararg val requ
device.serial.startsWith("emulator-")
)
}
+
+ DeviceType.ANY -> Unit
}
supportedFeatures = adb.execute(FetchDeviceFeaturesRequest(device.serial))
diff --git a/android-junit4-test-annotation-producer/build.gradle.kts b/android-junit4-test-annotation-producer/build.gradle.kts
index f284bc41e..08b03c911 100644
--- a/android-junit4-test-annotation-producer/build.gradle.kts
+++ b/android-junit4-test-annotation-producer/build.gradle.kts
@@ -22,11 +22,13 @@ plugins {
}
android {
- compileSdk = 30
+ namespace = "com.malinskiy.adam.junit4.android.listener"
+
+ compileSdk = 33
defaultConfig {
minSdk = 14
- targetSdk = 30
+ targetSdk = 33
}
sourceSets {
@@ -50,7 +52,7 @@ java {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.apiVersion = "1.5"
- kotlinOptions.languageVersion = "1.5"
+ kotlinOptions.languageVersion = "1.8"
}
dependencies {
diff --git a/android-junit4-test-annotation-producer/src/main/AndroidManifest.xml b/android-junit4-test-annotation-producer/src/main/AndroidManifest.xml
index 54c6efef3..b2cce1556 100644
--- a/android-junit4-test-annotation-producer/src/main/AndroidManifest.xml
+++ b/android-junit4-test-annotation-producer/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-
+
-
+
diff --git a/android-junit4/build.gradle.kts b/android-junit4/build.gradle.kts
index 4bb967faf..41a0ac738 100644
--- a/android-junit4/build.gradle.kts
+++ b/android-junit4/build.gradle.kts
@@ -22,11 +22,13 @@ plugins {
}
android {
- compileSdk = 30
+ namespace = "com.malinskiy.adam.junit4.android"
+
+ compileSdk = 33
defaultConfig {
minSdk = 14
- targetSdk = 30
+ targetSdk = 33
}
sourceSets {
@@ -50,7 +52,7 @@ java {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.apiVersion = "1.5"
- kotlinOptions.languageVersion = "1.5"
+ kotlinOptions.languageVersion = "1.8"
}
dependencies {
diff --git a/android-junit4/src/main/AndroidManifest.xml b/android-junit4/src/main/AndroidManifest.xml
index 840269fa7..b2cce1556 100644
--- a/android-junit4/src/main/AndroidManifest.xml
+++ b/android-junit4/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-
+
-
+
diff --git a/android-testrunner-contract/build.gradle.kts b/android-testrunner-contract/build.gradle.kts
index 0a9344bc1..2857b51e4 100644
--- a/android-testrunner-contract/build.gradle.kts
+++ b/android-testrunner-contract/build.gradle.kts
@@ -26,7 +26,7 @@ java {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.apiVersion = "1.5"
- kotlinOptions.languageVersion = "1.5"
+ kotlinOptions.languageVersion = "1.8"
}
Deployment.initialize(project)
diff --git a/androidx-screencapture/build.gradle.kts b/androidx-screencapture/build.gradle.kts
index fb699f153..a9113e405 100644
--- a/androidx-screencapture/build.gradle.kts
+++ b/androidx-screencapture/build.gradle.kts
@@ -22,11 +22,13 @@ plugins {
}
android {
- compileSdk = 30
+ namespace = "com.malinskiy.adam.junit4.android.screencapture"
+
+ compileSdk = 33
defaultConfig {
minSdk = 14
- targetSdk = 30
+ targetSdk = 33
}
sourceSets {
@@ -50,7 +52,7 @@ java {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.apiVersion = "1.5"
- kotlinOptions.languageVersion = "1.5"
+ kotlinOptions.languageVersion = "1.8"
}
dependencies {
diff --git a/androidx-screencapture/src/main/AndroidManifest.xml b/androidx-screencapture/src/main/AndroidManifest.xml
index 158990e82..b2cce1556 100644
--- a/androidx-screencapture/src/main/AndroidManifest.xml
+++ b/androidx-screencapture/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-
+
-
+
diff --git a/build.gradle.kts b/build.gradle.kts
index 04ebddce1..cd03622bd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,5 @@
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
+import java.util.*
buildscript {
repositories {
@@ -16,7 +17,7 @@ plugins {
}
fun isNonStable(version: String): Boolean {
- val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
+ val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase(Locale.ENGLISH).contains(it) }
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
val isStable = stableKeyword || regex.matches(version)
return isStable.not()
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index fa52915f9..e00e32beb 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -9,6 +9,6 @@ repositories {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
- implementation("com.android.tools.build:gradle:7.0.4")
- implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10")
+ implementation("com.android.tools.build:gradle:7.4.1")
+ implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10")
}
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 6989af1d8..a57151824 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,33 +1,33 @@
object Versions {
- val adam = System.getenv("GIT_TAG_NAME") ?: "0.4.7"
- val kotlin = "1.6.21"
+ val adam = System.getenv("GIT_TAG_NAME") ?: "0.5.1"
+ val kotlin = "1.8.10"
val coroutines = "1.6.4"
val coroutinesDebug = coroutines
- val annotations = "23.0.0"
- val ktor = "2.0.3"
- val logging = "2.1.23"
- val vertx = "4.3.3"
+ val annotations = "24.0.1"
+ val ktor = "2.3.0"
+ val logging = "3.0.5"
+ val vertx = "4.4.1"
val apacheCommonsPool2 = "2.11.1"
val assertk = "0.25"
val junit4 = "4.13.2"
- val junit5 = "5.9.0"
- val junit5commons = "1.9.0"
+ val junit5 = "5.9.2"
+ val junit5commons = "1.9.2"
val imageComparison = "4.4.0"
val dokka = kotlin
- val grpc = "1.49.0"
+ val grpc = "1.54.1"
val grpcKotlin = "1.3.0"
- val grpcOkhttp = "1.49.0"
- val protobufGradle = "0.8.19"
- val protobuf = "3.21.5"
+ val grpcOkhttp = "1.54.1"
+ val protobufGradle = "0.9.2"
+ val protobuf = "3.22.3"
val javax = "1.3.2"
- val androidGradle = "7.2.2"
- val testMonitor = "1.5.0"
- val testRunner = "1.4.0"
- val gradleVersionsPlugin = "0.42.0"
+ val androidGradle = "7.4.1"
+ val testMonitor = "1.6.1"
+ val testRunner = "1.5.2"
+ val gradleVersionsPlugin = "0.46.0"
}
object BuildPlugins {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 028f4c0d9..57a0f31f7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
#Sun Aug 04 13:21:59 AEST 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
diff --git a/server/server-stub-junit4/build.gradle.kts b/server/server-stub-junit4/build.gradle.kts
index 44a0a86b7..096cff552 100644
--- a/server/server-stub-junit4/build.gradle.kts
+++ b/server/server-stub-junit4/build.gradle.kts
@@ -23,7 +23,7 @@ Deployment.initialize(project)
tasks.jacocoTestReport {
reports {
- xml.isEnabled = true
+ xml.required.set(true)
}
}
@@ -35,7 +35,7 @@ java {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.apiVersion = "1.5"
- kotlinOptions.languageVersion = "1.5"
+ kotlinOptions.languageVersion = "1.8"
}
dependencies {
diff --git a/server/server-stub-junit5/build.gradle.kts b/server/server-stub-junit5/build.gradle.kts
index 35595c46a..d6ab688af 100644
--- a/server/server-stub-junit5/build.gradle.kts
+++ b/server/server-stub-junit5/build.gradle.kts
@@ -23,7 +23,7 @@ Deployment.initialize(project)
tasks.jacocoTestReport {
reports {
- xml.isEnabled = true
+ xml.required.set(true)
}
}
@@ -35,7 +35,7 @@ java {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.apiVersion = "1.5"
- kotlinOptions.languageVersion = "1.5"
+ kotlinOptions.languageVersion = "1.8"
}
dependencies {
diff --git a/server/server-stub/build.gradle.kts b/server/server-stub/build.gradle.kts
index 575a77fbe..ee2e6c509 100644
--- a/server/server-stub/build.gradle.kts
+++ b/server/server-stub/build.gradle.kts
@@ -56,7 +56,7 @@ val jacocoIntegrationTestReport = task("jacocoIntegrationTestRepor
description = "Generates code coverage report for integrationTest task"
group = "verification"
reports {
- xml.isEnabled = true
+ xml.required.set(true)
}
executionData(integrationTest)
@@ -67,7 +67,7 @@ tasks.check { dependsOn(integrationTest, jacocoIntegrationTestReport) }
tasks.jacocoTestReport {
reports {
- xml.isEnabled = true
+ xml.required.set(true)
}
}
@@ -79,7 +79,7 @@ java {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.apiVersion = "1.5"
- kotlinOptions.languageVersion = "1.5"
+ kotlinOptions.languageVersion = "1.8"
}
dependencies {
diff --git a/transport-ktor/build.gradle.kts b/transport-ktor/build.gradle.kts
index 906fc2f82..4439b1036 100644
--- a/transport-ktor/build.gradle.kts
+++ b/transport-ktor/build.gradle.kts
@@ -26,7 +26,7 @@ java {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.apiVersion = "1.5"
- kotlinOptions.languageVersion = "1.5"
+ kotlinOptions.languageVersion = "1.8"
}
dependencies {