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.

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

Update more depenedencies #86

Merged
merged 3 commits into from
Sep 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions adam/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions android-junit4-test-annotation-producer/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions android-junit4/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions android-testrunner-contract/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
65 changes: 65 additions & 0 deletions androidx-screencapture/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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)
}
16 changes: 16 additions & 0 deletions androidx-screencapture/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
21 changes: 21 additions & 0 deletions androidx-screencapture/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ 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.
-->

<manifest package="com.malinskiy.adam.junit4.android.screencapture">

<application/>
</manifest>
16 changes: 8 additions & 8 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions server/server-stub-junit4/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions server/server-stub-junit5/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions server/server-stub/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions transport-ktor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down