diff --git a/adam/build.gradle.kts b/adam/build.gradle.kts index e1d500a51..e990a7e25 100644 --- a/adam/build.gradle.kts +++ b/adam/build.gradle.kts @@ -145,8 +145,8 @@ java { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions.jvmTarget = "1.8" - kotlinOptions.apiVersion = "1.6" - kotlinOptions.languageVersion = "1.6" + kotlinOptions.apiVersion = "1.5" + kotlinOptions.languageVersion = "1.5" } dependencies { diff --git a/android-junit4-test-annotation-producer/build.gradle.kts b/android-junit4-test-annotation-producer/build.gradle.kts index 66c4d036a..f284bc41e 100644 --- a/android-junit4-test-annotation-producer/build.gradle.kts +++ b/android-junit4-test-annotation-producer/build.gradle.kts @@ -49,8 +49,8 @@ java { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions.jvmTarget = "1.8" - kotlinOptions.apiVersion = "1.6" - kotlinOptions.languageVersion = "1.6" + kotlinOptions.apiVersion = "1.5" + kotlinOptions.languageVersion = "1.5" } dependencies { diff --git a/android-junit4/build.gradle.kts b/android-junit4/build.gradle.kts index 667d80b5d..4bb967faf 100644 --- a/android-junit4/build.gradle.kts +++ b/android-junit4/build.gradle.kts @@ -49,8 +49,8 @@ java { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions.jvmTarget = "1.8" - kotlinOptions.apiVersion = "1.6" - kotlinOptions.languageVersion = "1.6" + kotlinOptions.apiVersion = "1.5" + kotlinOptions.languageVersion = "1.5" } dependencies { diff --git a/android-testrunner-contract/build.gradle.kts b/android-testrunner-contract/build.gradle.kts index 5cb089400..0a9344bc1 100644 --- a/android-testrunner-contract/build.gradle.kts +++ b/android-testrunner-contract/build.gradle.kts @@ -25,8 +25,8 @@ java { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions.jvmTarget = "1.8" - kotlinOptions.apiVersion = "1.6" - kotlinOptions.languageVersion = "1.6" + kotlinOptions.apiVersion = "1.5" + kotlinOptions.languageVersion = "1.5" } Deployment.initialize(project) diff --git a/androidx-screencapture/build.gradle.kts b/androidx-screencapture/build.gradle.kts new file mode 100644 index 000000000..fb699f153 --- /dev/null +++ b/androidx-screencapture/build.gradle.kts @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2021 Anton Malinskiy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +plugins { + id("com.android.library") + id("kotlin-android") + id("maven-publish") + id("org.jetbrains.dokka") +} + +android { + compileSdk = 30 + + defaultConfig { + minSdk = 14 + targetSdk = 30 + } + + sourceSets { + getByName("main") { + java.srcDir("src/main/kotlin") + } + getByName("test") { + java.srcDir("src/test/kotlin") + } + getByName("androidTest") { + java.srcDir("src/androidTest/kotlin") + } + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { + kotlinOptions.jvmTarget = "1.8" + kotlinOptions.apiVersion = "1.5" + kotlinOptions.languageVersion = "1.5" +} + +dependencies { + implementation(kotlin("stdlib-jdk8", version = Versions.kotlin)) + api(AndroidX.androidXScreenshot) + api(AndroidX.testMonitor) + api(TestLibraries.junit4) +} + +afterEvaluate { + Deployment.initialize(project) +} diff --git a/androidx-screencapture/gradle.properties b/androidx-screencapture/gradle.properties new file mode 100644 index 000000000..20bb35050 --- /dev/null +++ b/androidx-screencapture/gradle.properties @@ -0,0 +1,16 @@ +# +# Copyright (C) 2021 Anton Malinskiy +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +android.useAndroidX=true diff --git a/androidx-screencapture/src/main/AndroidManifest.xml b/androidx-screencapture/src/main/AndroidManifest.xml new file mode 100644 index 000000000..158990e82 --- /dev/null +++ b/androidx-screencapture/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 0da9680e8..f4533fc63 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,30 +1,30 @@ object Versions { val adam = System.getenv("GIT_TAG_NAME") ?: "0.4.5" val kotlin = "1.6.21" - val coroutines = "1.6.3" + 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.1" + val vertx = "4.3.3" val apacheCommonsPool2 = "2.11.1" val assertk = "0.25" val junit4 = "4.13.2" - val junit5 = "5.8.2" - val junit5commons = "1.8.2" + val junit5 = "5.9.0" + val junit5commons = "1.9.0" val imageComparison = "4.4.0" val dokka = kotlin - val grpc = "1.47.0" + val grpc = "1.49.0" val grpcKotlin = "1.3.0" - val grpcOkhttp = "1.47.0" + val grpcOkhttp = "1.49.0" val protobufGradle = "0.8.19" - val protobuf = "3.21.2" + val protobuf = "3.21.5" val javax = "1.3.2" - val androidGradle = "7.2.1" + val androidGradle = "7.2.2" val testMonitor = "1.5.0" val testRunner = "1.4.0" val gradleVersionsPlugin = "0.42.0" diff --git a/server/server-stub-junit4/build.gradle.kts b/server/server-stub-junit4/build.gradle.kts index 60052dc38..44a0a86b7 100644 --- a/server/server-stub-junit4/build.gradle.kts +++ b/server/server-stub-junit4/build.gradle.kts @@ -34,8 +34,8 @@ java { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions.jvmTarget = "1.8" - kotlinOptions.apiVersion = "1.6" - kotlinOptions.languageVersion = "1.6" + kotlinOptions.apiVersion = "1.5" + kotlinOptions.languageVersion = "1.5" } dependencies { diff --git a/server/server-stub-junit5/build.gradle.kts b/server/server-stub-junit5/build.gradle.kts index 413ada19d..35595c46a 100644 --- a/server/server-stub-junit5/build.gradle.kts +++ b/server/server-stub-junit5/build.gradle.kts @@ -34,8 +34,8 @@ java { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions.jvmTarget = "1.8" - kotlinOptions.apiVersion = "1.6" - kotlinOptions.languageVersion = "1.6" + kotlinOptions.apiVersion = "1.5" + kotlinOptions.languageVersion = "1.5" } dependencies { diff --git a/server/server-stub/build.gradle.kts b/server/server-stub/build.gradle.kts index 7ab9ca74e..575a77fbe 100644 --- a/server/server-stub/build.gradle.kts +++ b/server/server-stub/build.gradle.kts @@ -78,8 +78,8 @@ java { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions.jvmTarget = "1.8" - kotlinOptions.apiVersion = "1.6" - kotlinOptions.languageVersion = "1.6" + kotlinOptions.apiVersion = "1.5" + kotlinOptions.languageVersion = "1.5" } dependencies { diff --git a/transport-ktor/build.gradle.kts b/transport-ktor/build.gradle.kts index fa47d3693..906fc2f82 100644 --- a/transport-ktor/build.gradle.kts +++ b/transport-ktor/build.gradle.kts @@ -25,8 +25,8 @@ java { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { kotlinOptions.jvmTarget = "1.8" - kotlinOptions.apiVersion = "1.6" - kotlinOptions.languageVersion = "1.6" + kotlinOptions.apiVersion = "1.5" + kotlinOptions.languageVersion = "1.5" } dependencies {