From d2976d41a6776f1eecfc432db1e97f1348853179 Mon Sep 17 00:00:00 2001 From: Rick Busarow Date: Thu, 26 Jan 2023 12:22:36 -0600 Subject: [PATCH] update AGP to 7.4.0 https://developer.android.com/studio/releases/gradle-plugin#7-4-0 --- buildSrc/build.gradle.kts | 5 +- dependencies/classpath.txt | 83 +++++++++---------- gradle/libs.versions.toml | 2 +- samples/tutorial/build.gradle | 2 +- .../dependencies/jsRuntimeClasspath.txt | 10 +++ .../dependencies/jsRuntimeClasspath.txt | 11 +++ 6 files changed, 67 insertions(+), 46 deletions(-) create mode 100644 workflow-core/dependencies/jsRuntimeClasspath.txt create mode 100644 workflow-runtime/dependencies/jsRuntimeClasspath.txt diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 8d78a33c8..0605cc195 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -30,6 +30,7 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + // Java 11 is required when compiling against AGP 7.4.0+ + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } diff --git a/dependencies/classpath.txt b/dependencies/classpath.txt index 1b4fcc8dd..0793411fa 100644 --- a/dependencies/classpath.txt +++ b/dependencies/classpath.txt @@ -1,42 +1,43 @@ -androidx.databinding:databinding-common:7.3.0 -androidx.databinding:databinding-compiler-common:7.3.0 -com.android.databinding:baseLibrary:7.3.0 -com.android.tools.analytics-library:crash:30.3.0 -com.android.tools.analytics-library:protos:30.3.0 -com.android.tools.analytics-library:shared:30.3.0 -com.android.tools.analytics-library:tracker:30.3.0 +androidx.databinding:databinding-common:7.4.1 +androidx.databinding:databinding-compiler-common:7.4.1 +com.android.databinding:baseLibrary:7.4.1 +com.android.tools.analytics-library:crash:30.4.1 +com.android.tools.analytics-library:protos:30.4.1 +com.android.tools.analytics-library:shared:30.4.1 +com.android.tools.analytics-library:tracker:30.4.1 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10 -com.android.tools.build:aapt2-proto:7.3.0-8691043 -com.android.tools.build:aaptcompiler:7.3.0 -com.android.tools.build:apksig:7.3.0 -com.android.tools.build:apkzlib:7.3.0 -com.android.tools.build:builder-model:7.3.0 -com.android.tools.build:builder-test-api:7.3.0 -com.android.tools.build:builder:7.3.0 -com.android.tools.build:bundletool:1.9.0 -com.android.tools.build:gradle-api:7.3.0 -com.android.tools.build:gradle:7.3.0 -com.android.tools.build:manifest-merger:30.3.0 +com.android.tools.build:aapt2-proto:7.4.1-8841542 +com.android.tools.build:aaptcompiler:7.4.1 +com.android.tools.build:apksig:7.4.1 +com.android.tools.build:apkzlib:7.4.1 +com.android.tools.build:builder-model:7.4.1 +com.android.tools.build:builder-test-api:7.4.1 +com.android.tools.build:builder:7.4.1 +com.android.tools.build:bundletool:1.11.4 +com.android.tools.build:gradle-api:7.4.1 +com.android.tools.build:gradle-settings-api:7.4.1 +com.android.tools.build:gradle:7.4.1 +com.android.tools.build:manifest-merger:30.4.1 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api -com.android.tools.ddms:ddmlib:30.3.0 -com.android.tools.layoutlib:layoutlib-api:30.3.0 -com.android.tools.lint:lint-model:30.3.0 -com.android.tools.lint:lint-typedef-remover:30.3.0 -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0 -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0 -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0 -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0 -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0 -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0 -com.android.tools:annotations:30.3.0 -com.android.tools:common:30.3.0 -com.android.tools:dvlib:30.3.0 -com.android.tools:repository:30.3.0 -com.android.tools:sdk-common:30.3.0 -com.android.tools:sdklib:30.3.0 -com.android:signflinger:7.3.0 -com.android:zipflinger:7.3.0 +com.android.tools.ddms:ddmlib:30.4.1 +com.android.tools.layoutlib:layoutlib-api:30.4.1 +com.android.tools.lint:lint-model:30.4.1 +com.android.tools.lint:lint-typedef-remover:30.4.1 +com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.1 +com.android.tools.utp:android-device-provider-gradle-proto:30.4.1 +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.1 +com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.1 +com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.1 +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.1 +com.android.tools:annotations:30.4.1 +com.android.tools:common:30.4.1 +com.android.tools:dvlib:30.4.1 +com.android.tools:repository:30.4.1 +com.android.tools:sdk-common:30.4.1 +com.android.tools:sdklib:30.4.1 +com.android:signflinger:7.4.1 +com.android:zipflinger:7.4.1 com.fasterxml.jackson.core:jackson-annotations:2.12.7 com.fasterxml.jackson.core:jackson-core:2.12.7 com.fasterxml.jackson.core:jackson-databind:2.12.7 @@ -63,9 +64,8 @@ com.google.j2objc:j2objc-annotations:1.3 com.google.jimfs:jimfs:1.1 com.google.protobuf:protobuf-java-util:3.17.2 com.google.protobuf:protobuf-java:3.17.2 -com.google.testing.platform:core-proto:0.0.8-alpha07 +com.google.testing.platform:core-proto:0.0.8-alpha08 com.googlecode.java-diff-utils:diffutils:1.3.0 -com.googlecode.json-simple:json-simple:1.1 com.googlecode.juniversalchardet:juniversalchardet:1.0.3 com.squareup.moshi:moshi:1.13.0 com.squareup.okhttp3:okhttp:4.10.0 @@ -103,7 +103,6 @@ io.netty:netty-handler:4.1.52.Final io.netty:netty-resolver:4.1.52.Final io.netty:netty-transport:4.1.52.Final io.perfmark:perfmark-api:0.23.0 -it.unimi.dsi:fastutil:8.4.0 jakarta.activation:jakarta.activation-api:1.2.1 jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 javax.annotation:javax.annotation-api:1.3.2 @@ -171,10 +170,10 @@ org.json:json:20180813 org.jsoup:jsoup:1.14.3 org.jvnet.staxex:stax-ex:1.8.1 org.openjdk.jmh:jmh-core:1.21 -org.ow2.asm:asm-analysis:9.1 -org.ow2.asm:asm-commons:9.1 +org.ow2.asm:asm-analysis:9.2 +org.ow2.asm:asm-commons:9.2 org.ow2.asm:asm-tree:9.2 -org.ow2.asm:asm-util:9.1 +org.ow2.asm:asm-util:9.2 org.ow2.asm:asm:9.2 org.slf4j:slf4j-api:1.7.30 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index de0f2d16b..6ed76d051 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -androidTools = "7.3.0" +androidTools = "7.4.1" compileSdk = "31" minSdkVersion = "21" diff --git a/samples/tutorial/build.gradle b/samples/tutorial/build.gradle index 81c9c992e..6ad1399dd 100644 --- a/samples/tutorial/build.gradle +++ b/samples/tutorial/build.gradle @@ -8,7 +8,7 @@ buildscript { deps = [ activityktx: 'androidx.activity:activity-ktx:1.3.0', - agp: "com.android.tools.build:gradle:7.3.0", + agp: "com.android.tools.build:gradle:7.4.1", appcompat: 'androidx.appcompat:appcompat:1.3.1', constraintlayout: 'androidx.constraintlayout:constraintlayout:2.0.1', kotlin: [ diff --git a/workflow-core/dependencies/jsRuntimeClasspath.txt b/workflow-core/dependencies/jsRuntimeClasspath.txt new file mode 100644 index 000000000..01e849a4d --- /dev/null +++ b/workflow-core/dependencies/jsRuntimeClasspath.txt @@ -0,0 +1,10 @@ +com.squareup.okio:okio-js:3.0.0 +com.squareup.okio:okio:3.0.0 +org.jetbrains.kotlin:atomicfu:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-js:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.10 +org.jetbrains.kotlinx:atomicfu-js:0.17.3 +org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 +org.jetbrains:annotations:13.0 diff --git a/workflow-runtime/dependencies/jsRuntimeClasspath.txt b/workflow-runtime/dependencies/jsRuntimeClasspath.txt new file mode 100644 index 000000000..493a179b5 --- /dev/null +++ b/workflow-runtime/dependencies/jsRuntimeClasspath.txt @@ -0,0 +1,11 @@ +:workflow-core +com.squareup.okio:okio-js:3.0.0 +com.squareup.okio:okio:3.0.0 +org.jetbrains.kotlin:atomicfu:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-js:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.10 +org.jetbrains.kotlinx:atomicfu-js:0.17.3 +org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 +org.jetbrains:annotations:13.0