diff --git a/WORKSPACE b/WORKSPACE index 3c834a27..0b0b81b3 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -27,7 +27,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") git_repository( name = "grab_bazel_common", - commit = "421f7a883add946c6a59e356e8e51800c44fb7a1", + commit = "2abb41f0fae9f9c973ca176e9b6b4b73928de2f8", remote = "https://github.com/grab/grab-bazel-common.git", ) @@ -82,7 +82,7 @@ maven_install( name = "android_test_maven", artifacts = [ "androidx.annotation:annotation-experimental:1.1.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.concurrent:concurrent-futures:1.1.0", "androidx.lifecycle:lifecycle-common:2.3.1", "androidx.test.espresso:espresso-core:3.5.1", @@ -113,9 +113,13 @@ maven_install( jetify_include_list = [ "android.arch.lifecycle:common", "com.android.support.test.espresso:espresso-idling-resource", + "com.android.support.test:monitor", "com.android.support.test:runner", "com.android.support:cardview-v7", "com.android.support:support-annotations", + "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", ], maven_install_json = "//:android_test_maven_install.json", override_targets = { @@ -123,9 +127,9 @@ maven_install( "androidx.annotation:annotation-experimental": "@maven//:androidx_annotation_annotation_experimental", "androidx.lifecycle:lifecycle-common": "@maven//:androidx_lifecycle_lifecycle_common", "javax.inject:javax.inject": "@maven//:javax_inject_javax_inject", - "org.jetbrains:annotations": "@maven//:org_jetbrains_annotations", "org.jetbrains.kotlin:kotlin-stdlib": "@maven//:org_jetbrains_kotlin_kotlin_stdlib", "org.jetbrains.kotlin:kotlin-stdlib-common": "@maven//:org_jetbrains_kotlin_kotlin_stdlib_common", + "org.jetbrains:annotations": "@maven//:org_jetbrains_annotations", }, repositories = [ "https://dl.google.com/dl/android/maven2/", @@ -142,7 +146,7 @@ android_test_maven_pinned_maven_install() maven_install( name = "debug_maven", artifacts = [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0", "androidx.arch.core:core-runtime:2.1.0", "androidx.collection:collection:1.0.0", @@ -190,6 +194,8 @@ maven_install( "com.android.support:recyclerview-v7", "com.android.support:support-annotations", "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", "com.android.support:versionedparcelable", ], maven_install_json = "//:debug_maven_install.json", @@ -208,7 +214,6 @@ maven_install( "androidx.lifecycle:lifecycle-viewmodel": "@maven//:androidx_lifecycle_lifecycle_viewmodel", "androidx.lifecycle:lifecycle-viewmodel-ktx": "@maven//:androidx_lifecycle_lifecycle_viewmodel_ktx", "androidx.versionedparcelable:versionedparcelable": "@maven//:androidx_versionedparcelable_versionedparcelable", - "org.jetbrains:annotations": "@maven//:org_jetbrains_annotations", "org.jetbrains.kotlin:kotlin-stdlib": "@maven//:org_jetbrains_kotlin_kotlin_stdlib", "org.jetbrains.kotlin:kotlin-stdlib-common": "@maven//:org_jetbrains_kotlin_kotlin_stdlib_common", "org.jetbrains.kotlin:kotlin-stdlib-jdk7": "@maven//:org_jetbrains_kotlin_kotlin_stdlib_jdk7", @@ -216,6 +221,7 @@ maven_install( "org.jetbrains.kotlinx:atomicfu": "@maven//:org_jetbrains_kotlinx_atomicfu", "org.jetbrains.kotlinx:kotlinx-coroutines-android": "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_android", "org.jetbrains.kotlinx:kotlinx-coroutines-core": "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core", + "org.jetbrains:annotations": "@maven//:org_jetbrains_annotations", }, repositories = [ "https://dl.google.com/dl/android/maven2/", @@ -237,7 +243,7 @@ maven_install( "androidx.activity:activity:1.7.2", "androidx.annotation:annotation-experimental:1.3.0", "androidx.annotation:annotation-jvm:1.6.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.appcompat:appcompat-resources:1.6.1", "androidx.appcompat:appcompat:1.6.1", "androidx.arch.core:core-common:2.2.0", @@ -342,12 +348,13 @@ maven_install( "com.android.support:loader", "com.android.support:support-annotations", "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", "com.android.support:support-fragment", "com.android.support:support-vector-drawable", "com.android.support:versionedparcelable", "com.android.support:viewpager", "com.google.ar.sceneform.ux:sceneform-ux", - "com.google.dagger:dagger", ], maven_install_json = "//:maven_install.json", override_targets = { @@ -377,11 +384,12 @@ maven_install( jetify = True, jetify_include_list = [ "com.android.support:cardview-v7", + "com.android.support:support-annotations", + "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", ], maven_install_json = "//:test_maven_install.json", - override_targets = { - "androidx.annotation:annotation": "@maven//:androidx_annotation_annotation_jvm", - }, repositories = [ "https://repo.maven.apache.org/maven2/", ], diff --git a/android_test_maven_install.json b/android_test_maven_install.json index c56f8ffb..a7ea1b70 100644 --- a/android_test_maven_install.json +++ b/android_test_maven_install.json @@ -1,8 +1,8 @@ { "dependency_tree": { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 554097264, - "__RESOLVED_ARTIFACTS_HASH": -631911611, + "__INPUT_ARTIFACTS_HASH": 2003390777, + "__RESOLVED_ARTIFACTS_HASH": -1106934159, "conflict_resolution": {}, "dependencies": [ { @@ -22,61 +22,31 @@ "url": "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-experimental/1.1.0/annotation-experimental-1.1.0.aar" }, { - "coord": "androidx.annotation:annotation-jvm:1.7.0-alpha03", - "dependencies": [ - "org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10", - "org.jetbrains.kotlin:kotlin-stdlib:1.7.10", - "org.jetbrains:annotations:13.0" - ], - "directDependencies": [ - "org.jetbrains.kotlin:kotlin-stdlib:1.7.10" - ], + "coord": "androidx.annotation:annotation:1.2.0", + "dependencies": [], + "directDependencies": [], "exclusions": [ "androidx.test.espresso:espresso-contrib" ], - "file": "v1/https/dl.google.com/dl/android/maven2/androidx/annotation/annotation-jvm/1.7.0-alpha03/annotation-jvm-1.7.0-alpha03.jar", + "file": "v1/https/dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.2.0/annotation-1.2.0.jar", "mirror_urls": [ - "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-jvm/1.7.0-alpha03/annotation-jvm-1.7.0-alpha03.jar", - "https://repo.maven.apache.org/maven2/androidx/annotation/annotation-jvm/1.7.0-alpha03/annotation-jvm-1.7.0-alpha03.jar" + "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.2.0/annotation-1.2.0.jar", + "https://repo.maven.apache.org/maven2/androidx/annotation/annotation/1.2.0/annotation-1.2.0.jar" ], "packages": [ "androidx.annotation" ], - "sha256": "e36b8e4b8393a4adc74e3d4ab22ad5a36396f0cea2e40b5734eae14937dfd224", - "url": "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-jvm/1.7.0-alpha03/annotation-jvm-1.7.0-alpha03.jar" - }, - { - "coord": "androidx.annotation:annotation:1.7.0-alpha03", - "dependencies": [ - "androidx.annotation:annotation-jvm:1.7.0-alpha03", - "org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10", - "org.jetbrains.kotlin:kotlin-stdlib:1.7.10", - "org.jetbrains:annotations:13.0" - ], - "directDependencies": [ - "androidx.annotation:annotation-jvm:1.7.0-alpha03", - "org.jetbrains.kotlin:kotlin-stdlib:1.7.10" - ], - "exclusions": [ - "androidx.test.espresso:espresso-contrib" - ], - "file": "v1/https/dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar", - "mirror_urls": [ - "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar", - "https://repo.maven.apache.org/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar" - ], - "packages": [], - "sha256": "b11676837cad011a5285d6074418649107ef25eba17131517e9557ef8c9984ed", - "url": "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar" + "sha256": "9029262bddce116e6d02be499e4afdba21f24c239087b76b3b57d7e98b490a36", + "url": "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.2.0/annotation-1.2.0.jar" }, { "coord": "androidx.concurrent:concurrent-futures:1.1.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "com.google.guava:listenablefuture:1.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "com.google.guava:listenablefuture:1.0" ], "exclusions": [ @@ -96,10 +66,10 @@ { "coord": "androidx.lifecycle:lifecycle-common:2.3.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.2.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.2.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -119,7 +89,7 @@ "coord": "androidx.test.espresso:espresso-core:3.5.1", "dependencies": [ "androidx.annotation:annotation-experimental:1.1.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.concurrent:concurrent-futures:1.1.0", "androidx.lifecycle:lifecycle-common:2.3.1", "androidx.test.espresso:espresso-idling-resource:3.5.1", @@ -142,7 +112,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.test.espresso:espresso-idling-resource:3.5.1", "androidx.test:annotation:1.0.1", "androidx.test:core:1.5.0", @@ -186,7 +156,7 @@ "coord": "androidx.test.ext:junit:1.1.5", "dependencies": [ "androidx.annotation:annotation-experimental:1.1.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.concurrent:concurrent-futures:1.1.0", "androidx.lifecycle:lifecycle-common:2.3.1", "androidx.test.services:storage:1.4.2", @@ -203,7 +173,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.test:core:1.5.0", "androidx.test:monitor:1.6.1", "junit:junit:4.13.2" @@ -224,13 +194,13 @@ "coord": "androidx.test.services:storage:1.4.2", "dependencies": [ "androidx.annotation:annotation-experimental:1.1.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.test:annotation:1.0.1", "androidx.test:monitor:1.6.1", "com.google.code.findbugs:jsr305:2.0.2" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.test:annotation:1.0.1", "androidx.test:monitor:1.6.1", "com.google.code.findbugs:jsr305:2.0.2" @@ -251,11 +221,11 @@ "coord": "androidx.test:annotation:1.0.1", "dependencies": [ "androidx.annotation:annotation-experimental:1.1.0", - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.2.0" ], "directDependencies": [ "androidx.annotation:annotation-experimental:1.1.0", - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.2.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -273,7 +243,7 @@ "coord": "androidx.test:core:1.5.0", "dependencies": [ "androidx.annotation:annotation-experimental:1.1.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.concurrent:concurrent-futures:1.1.0", "androidx.lifecycle:lifecycle-common:2.3.1", "androidx.test.services:storage:1.4.2", @@ -287,7 +257,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.concurrent:concurrent-futures:1.1.0", "androidx.lifecycle:lifecycle-common:2.3.1", "androidx.test.services:storage:1.4.2", @@ -312,12 +282,12 @@ "coord": "androidx.test:monitor:1.6.1", "dependencies": [ "androidx.annotation:annotation-experimental:1.1.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.test:annotation:1.0.1", "androidx.tracing:tracing:1.0.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.test:annotation:1.0.1", "androidx.tracing:tracing:1.0.0" ], @@ -337,7 +307,7 @@ "coord": "androidx.test:runner:1.5.2", "dependencies": [ "androidx.annotation:annotation-experimental:1.1.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.test.services:storage:1.4.2", "androidx.test:annotation:1.0.1", "androidx.test:monitor:1.6.1", @@ -346,7 +316,7 @@ "org.hamcrest:hamcrest-core:1.3" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.2.0", "androidx.test.services:storage:1.4.2", "androidx.test:annotation:1.0.1", "androidx.test:monitor:1.6.1", @@ -368,10 +338,10 @@ { "coord": "androidx.tracing:tracing:1.0.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.2.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.2.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" diff --git a/build.gradle b/build.gradle index f768195d..48cec2cb 100644 --- a/build.gradle +++ b/build.gradle @@ -92,8 +92,7 @@ grazel { } dependencies { overrideArtifactVersions.addAll( - "androidx.constraintlayout:constraintlayout:2.1.4", - "androidx.annotation:annotation:1.7.0-alpha03" + //"androidx.constraintlayout:constraintlayout:2.1.4", ) } rules { @@ -103,7 +102,7 @@ grazel { } bazelCommon { gitRepository { - commit = "421f7a883add946c6a59e356e8e51800c44fb7a1" + commit = "2abb41f0fae9f9c973ca176e9b6b4b73928de2f8" remote = "https://github.com/grab/grab-bazel-common.git" } toolchains { @@ -130,7 +129,13 @@ grazel { excludeArtifacts.add("androidx.test.espresso:espresso-contrib") // Force add any artifact for jetifier - jetifyIncludeList.add("com.android.support:cardview-v7") + jetifyIncludeList.addAll( + "com.android.support:cardview-v7", + "com.android.support:support-annotations", + "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", + ) artifactPinning { enabled.set(true) diff --git a/debug_maven_install.json b/debug_maven_install.json index 57f48977..08a810f8 100644 --- a/debug_maven_install.json +++ b/debug_maven_install.json @@ -1,61 +1,35 @@ { "dependency_tree": { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 1551674652, - "__RESOLVED_ARTIFACTS_HASH": 64201958, + "__INPUT_ARTIFACTS_HASH": -2060317578, + "__RESOLVED_ARTIFACTS_HASH": -587511224, "conflict_resolution": {}, "dependencies": [ { - "coord": "androidx.annotation:annotation-jvm:1.7.0-alpha03", - "dependencies": [ - "org.jetbrains.kotlin:kotlin-stdlib:1.5.31" - ], - "directDependencies": [ - "org.jetbrains.kotlin:kotlin-stdlib:1.5.31" - ], + "coord": "androidx.annotation:annotation:1.1.0", + "dependencies": [], + "directDependencies": [], "exclusions": [ "androidx.test.espresso:espresso-contrib" ], - "file": "v1/https/dl.google.com/dl/android/maven2/androidx/annotation/annotation-jvm/1.7.0-alpha03/annotation-jvm-1.7.0-alpha03.jar", + "file": "v1/https/dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.jar", "mirror_urls": [ - "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-jvm/1.7.0-alpha03/annotation-jvm-1.7.0-alpha03.jar", - "https://repo.maven.apache.org/maven2/androidx/annotation/annotation-jvm/1.7.0-alpha03/annotation-jvm-1.7.0-alpha03.jar" + "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.jar", + "https://repo.maven.apache.org/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.jar" ], "packages": [ "androidx.annotation" ], - "sha256": "e36b8e4b8393a4adc74e3d4ab22ad5a36396f0cea2e40b5734eae14937dfd224", - "url": "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-jvm/1.7.0-alpha03/annotation-jvm-1.7.0-alpha03.jar" - }, - { - "coord": "androidx.annotation:annotation:1.7.0-alpha03", - "dependencies": [ - "androidx.annotation:annotation-jvm:1.7.0-alpha03", - "org.jetbrains.kotlin:kotlin-stdlib:1.5.31" - ], - "directDependencies": [ - "androidx.annotation:annotation-jvm:1.7.0-alpha03", - "org.jetbrains.kotlin:kotlin-stdlib:1.5.31" - ], - "exclusions": [ - "androidx.test.espresso:espresso-contrib" - ], - "file": "v1/https/dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar", - "mirror_urls": [ - "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar", - "https://repo.maven.apache.org/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar" - ], - "packages": [], - "sha256": "b11676837cad011a5285d6074418649107ef25eba17131517e9557ef8c9984ed", - "url": "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar" + "sha256": "d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692", + "url": "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.jar" }, { "coord": "androidx.arch.core:core-common:2.1.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.1.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.1.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -75,11 +49,11 @@ { "coord": "androidx.arch.core:core-runtime:2.1.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0" ], "exclusions": [ @@ -97,10 +71,10 @@ { "coord": "androidx.collection:collection:1.0.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.1.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.1.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -119,12 +93,12 @@ { "coord": "androidx.core:core-ktx:aar:1.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.core:core:aar:1.3.2", "org.jetbrains.kotlin:kotlin-stdlib:1.5.31" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.core:core:aar:1.3.2", "org.jetbrains.kotlin:kotlin-stdlib:1.5.31" ], @@ -143,13 +117,13 @@ { "coord": "androidx.core:core:1.3.2", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.collection:collection:1.0.0", "androidx.lifecycle:lifecycle-runtime:aar:2.2.0", "androidx.versionedparcelable:versionedparcelable:aar:1.1.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.collection:collection:1.0.0", "androidx.lifecycle:lifecycle-runtime:aar:2.2.0", "androidx.versionedparcelable:versionedparcelable:aar:1.1.0" @@ -169,11 +143,11 @@ { "coord": "androidx.customview:customview:1.0.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.core:core:aar:1.3.2" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.core:core:aar:1.3.2" ], "exclusions": [ @@ -191,10 +165,10 @@ { "coord": "androidx.lifecycle:lifecycle-common:2.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.1.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.1.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -213,7 +187,7 @@ { "coord": "androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.lifecycle:lifecycle-common:2.2.0", @@ -239,7 +213,7 @@ { "coord": "androidx.lifecycle:lifecycle-livedata-core:2.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.lifecycle:lifecycle-common:2.2.0" @@ -264,7 +238,7 @@ { "coord": "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.lifecycle:lifecycle-common:2.2.0", @@ -295,7 +269,7 @@ { "coord": "androidx.lifecycle:lifecycle-livedata:2.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.lifecycle:lifecycle-common:2.2.0", @@ -321,7 +295,7 @@ { "coord": "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0", "androidx.lifecycle:lifecycle-common:2.2.0", "androidx.lifecycle:lifecycle-runtime:aar:2.2.0", @@ -329,7 +303,7 @@ "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.lifecycle:lifecycle-runtime:aar:2.2.0", "org.jetbrains.kotlin:kotlin-stdlib:1.5.31", "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2" @@ -349,12 +323,12 @@ { "coord": "androidx.lifecycle:lifecycle-runtime:2.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0", "androidx.lifecycle:lifecycle-common:2.2.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0", "androidx.lifecycle:lifecycle-common:2.2.0" ], @@ -373,7 +347,7 @@ { "coord": "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.lifecycle:lifecycle-viewmodel:aar:2.2.0", "org.jetbrains.kotlin:kotlin-stdlib:1.5.31", "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2" @@ -398,10 +372,10 @@ { "coord": "androidx.lifecycle:lifecycle-viewmodel:2.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.1.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.1.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -438,7 +412,7 @@ { "coord": "androidx.paging:paging-common:3.1.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0", "org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31", "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30", @@ -449,7 +423,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0", "org.jetbrains.kotlin:kotlin-stdlib:1.5.31", "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2" @@ -472,7 +446,7 @@ { "coord": "androidx.paging:paging-runtime:3.1.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.collection:collection:1.0.0", @@ -527,7 +501,7 @@ { "coord": "androidx.recyclerview:recyclerview:1.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.collection:collection:1.0.0", "androidx.core:core:aar:1.3.2", "androidx.customview:customview:aar:1.0.0", @@ -535,7 +509,7 @@ "androidx.versionedparcelable:versionedparcelable:aar:1.1.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.collection:collection:1.0.0", "androidx.core:core:aar:1.3.2", "androidx.customview:customview:aar:1.0.0" @@ -555,11 +529,11 @@ { "coord": "androidx.versionedparcelable:versionedparcelable:1.1.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.collection:collection:1.0.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.1.0", "androidx.collection:collection:1.0.0" ], "exclusions": [ diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/AndroidRules.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/AndroidRules.kt index 34e0fd33..31b78d2b 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/AndroidRules.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/AndroidRules.kt @@ -271,6 +271,7 @@ fun StatementsBuilder.androidUnitTest( deps: List = emptyList(), associates: List = emptyList(), plugins: List = emptyList(), + enableCompose: Boolean = false, tags: List = emptyList(), resourcesGlob: List = emptyList(), ) { @@ -295,6 +296,9 @@ fun StatementsBuilder.androidUnitTest( deps.notEmpty { "deps" `=` array(deps.map(BazelDependency::toString).map(String::quote)) } + if (enableCompose) { + "enable_compose" `=` enableCompose.toString().capitalize() + } plugins.notEmpty { "plugins" `=` array(plugins.map(BazelDependency::toString).map(String::quote)) } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/MigrationCriteria.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/MigrationCriteria.kt index 1da992dd..013e6242 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/MigrationCriteria.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/MigrationCriteria.kt @@ -63,7 +63,9 @@ internal class MigrationChecker @Inject constructor( return when { canMigrateInternal(project) -> true else -> { - dependencyGraphsProvider.get().dependenciesSubGraph(project) + dependencyGraphsProvider + .get() + .dependenciesSubGraph(project) .all(::canMigrateInternal) } } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/ComputeWorkspaceDependencies.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/ComputeWorkspaceDependencies.kt index 8fedad8c..277f5217 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/ComputeWorkspaceDependencies.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/ComputeWorkspaceDependencies.kt @@ -133,6 +133,12 @@ internal class ComputeWorkspaceDependencies { ).apply { put(DEFAULT_VARIANT, defaultFlatClasspath) } .mapValues { it.value.values.sortedBy(ResolvedDependency::id) } + // Clear maps to allow GC + defaultFlatClasspath.clear() + flattenClasspath.clear() + reducedClasspath.clear() + defaultClasspath.clear() + classPaths.clear() return WorkspaceDependencies(result = reducedFinalClasspath) } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/Jetifier.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/Jetifier.kt index 930ab72b..9264cfd3 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/Jetifier.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/Jetifier.kt @@ -147,4 +147,6 @@ val JetifiedArtifacts = mapOf( "androidx.work:work-rxjava2" to "android.arch.work:work-rxjava2", "androidx.work:work-testing" to "android.arch.work:work-testing", "com.google.android.material:material" to "com.android.support:design" -) \ No newline at end of file +) + +val DefaultJetifierExclusions = setOf("com.android.support:support-v4") \ No newline at end of file diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/ResolvedComponentsVisitor.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/ResolvedComponentsVisitor.kt index 5cf1e6da..4b3aa13f 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/ResolvedComponentsVisitor.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/ResolvedComponentsVisitor.kt @@ -51,6 +51,10 @@ internal class ResolvedComponentsVisitor { private val Node.isProject get() = toString().startsWith("project :") private val Node.repository get() = (this as? DefaultResolvedComponentResult)?.repositoryName ?: "" + private val Node.shortId get() = toString().substringBeforeLast(":") + + private val ComponentSelector.isLegacySupportLibrary + get() = toString().startsWith("com.android.support") data class VisitResult( val component: Node, @@ -68,14 +72,10 @@ internal class ResolvedComponentsVisitor { */ data class DependencyResult( val dependency: Node, + val requiresJetifier: Boolean, val unjetifiedSource: String? ) - private val ComponentSelector.isLegacySupportLibrary - get() = toString().startsWith("com.android.support") - - private val Node.shortId get() = toString().substringBeforeLast(":") - /** * Visit all external dependency nodes in the graph and map them to [T] using the [transform] * function. Both current component and its transitive dependencies are provided in the callback @@ -89,27 +89,25 @@ internal class ResolvedComponentsVisitor { logger: (message: String) -> Unit = { }, transform: (visitResult: VisitResult) -> T? ): Set { - val transitiveClosureMap = mutableMapOf>() + val allDependenciesMap = mutableMapOf>() val visited = mutableSetOf() val result = TreeSet(compareBy { it }) - data class JetifyResult(var enabled: Boolean = false) - /** * Do a depth-first visit to collect all transitive dependencies * * @param node Current component node - * @param jetify Holder to store jetifier result across call stack * @param level The current traversal depth */ - fun dfs(node: Node, jetify: JetifyResult = JetifyResult(), level: Int = 0) { + fun dfs(node: Node, level: Int = 0) { if (node in visited) return visited.add(node) printIndented(level, node.toString(), logger) - val transitiveDeps = TreeSet(compareBy { - it.dependency.toString() - }) + // Collection to collect all transitive dependencies + val allDependencies = TreeSet( + compareBy { it.dependency.toString() } + ) node.dependencies .asSequence() .filterIsInstance() @@ -117,34 +115,36 @@ internal class ResolvedComponentsVisitor { .filter { (selected, _) -> !selected.isProject } .filter { (dep, _) -> IGNORED_ARTIFACTS.none { dep.toString().startsWith(it) } } .forEach { (directDependency, requested) -> - jetify.enabled = jetify.enabled || requested.isLegacySupportLibrary - dfs(directDependency, jetify, level + 1) + dfs(directDependency, level + 1) - transitiveDeps.add( + allDependencies.add( DependencyResult( dependency = directDependency, + requiresJetifier = requested.isLegacySupportLibrary, unjetifiedSource = JetifiedArtifacts[directDependency.shortId] ) ) - transitiveDeps.addAll( - transitiveClosureMap[directDependency] ?: emptySet() + allDependencies.addAll( + allDependenciesMap[directDependency] ?: emptySet() ) } - transitiveClosureMap[node] = transitiveDeps + allDependenciesMap[node] = allDependencies if (!node.isProject) { transform( VisitResult( component = node, repository = node.repository, - transitiveDeps = transitiveDeps, - requiresJetifier = jetify.enabled + transitiveDeps = allDependencies, + requiresJetifier = allDependencies.any { it.requiresJetifier } ) )?.let(result::add) } } dfs(root) + allDependenciesMap.clear() + visited.clear() return result } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/model/ResolveDependenciesResult.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/model/ResolveDependenciesResult.kt index c988d717..63ea08f3 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/model/ResolveDependenciesResult.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/dependencies/model/ResolveDependenciesResult.kt @@ -53,9 +53,29 @@ internal data class ResolvedDependency( override fun compareTo(other: ResolvedDependency) = id.compareTo(other.id) companion object { + private operator fun List.component6() = get(5) + + /** + * Construct [ResolvedDependency] from id alone + */ + fun fromId(id: String, repository: String): ResolvedDependency { + val (group, name, version) = id.split(":") + return ResolvedDependency( + id = id, + version = version, + shortId = "$group:$name", + direct = true, + dependencies = emptySet(), + excludeRules = emptySet(), + repository = repository, + requiresJetifier = false, + jetifierSource = null + ) + } + fun from(dependencyNotation: String): ResolvedDependency { val chunks = dependencyNotation.split(":") - val (group, name, version, repository, jetifierGroup) = chunks + val (group, name, version, repository, requiresJetifier, jetifierGroup) = chunks val shortId = "$group:$name" val jetifierSource = if (jetifierGroup != "null") "$jetifierGroup:${chunks.last()}" else null @@ -67,17 +87,18 @@ internal data class ResolvedDependency( dependencies = emptySet(), excludeRules = emptySet(), repository = repository, - requiresJetifier = false, + requiresJetifier = requiresJetifier.toBoolean(), jetifierSource = jetifierSource ) } fun createDependencyNotation( component: ResolvedComponentResult, + requiresJetifier: Boolean, jetifierSource: String? ): String { val repository = (component as? DefaultResolvedComponentResult)?.repositoryName ?: "" - return "$component:${repository}:$jetifierSource" + return "$component:${repository}:$requiresJetifier:$jetifierSource" } } } @@ -85,9 +106,10 @@ internal data class ResolvedDependency( internal fun ResolvedDependency.merge(other: ResolvedDependency): ResolvedDependency { return copy( direct = direct || other.direct, - excludeRules = (excludeRules + other.excludeRules) - .toList() - .toSortedSet(compareBy(ExcludeRule::toString)), + dependencies = (dependencies + other.dependencies).toSortedSet(), + jetifierSource = jetifierSource ?: other.jetifierSource, + overrideTarget = overrideTarget ?: other.overrideTarget, + excludeRules = (excludeRules + other.excludeRules).toSortedSet(compareBy(ExcludeRule::toString)), ) } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidUnitTestData.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidUnitTestData.kt index 3f010077..6b3a180e 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidUnitTestData.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidUnitTestData.kt @@ -27,6 +27,7 @@ data class AndroidUnitTestData( val customPackage: String, val associates: List, val resources: List, + val compose: Boolean, ) internal fun AndroidUnitTestData.toUnitTestTarget() = AndroidUnitTestTarget( @@ -38,4 +39,5 @@ internal fun AndroidUnitTestData.toUnitTestTarget() = AndroidUnitTestTarget( customPackage = customPackage, resources = resources, tags = tags, + compose = compose ) diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidUnitTestDataExtractor.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidUnitTestDataExtractor.kt index 885046c0..7a4c8b6b 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidUnitTestDataExtractor.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidUnitTestDataExtractor.kt @@ -24,6 +24,7 @@ import com.grab.grazel.gradle.dependencies.BuildGraphType import com.grab.grazel.gradle.dependencies.DependenciesDataSource import com.grab.grazel.gradle.dependencies.DependencyGraphs import com.grab.grazel.gradle.dependencies.GradleDependencyToBazelDependency +import com.grab.grazel.gradle.hasCompose import com.grab.grazel.gradle.variant.AndroidVariantDataSource import com.grab.grazel.gradle.variant.MatchedVariant import com.grab.grazel.gradle.variant.getMigratableBuildVariants @@ -102,6 +103,7 @@ internal class DefaultAndroidUnitTestDataExtractor @Inject constructor( customPackage = packageName, associates = buildList { associate?.let(::add) }, resources = resources, + compose = project.hasCompose ) } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidUnitTestTarget.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidUnitTestTarget.kt index efaec8e2..dc45fc4e 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidUnitTestTarget.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidUnitTestTarget.kt @@ -33,6 +33,7 @@ internal data class AndroidUnitTestTarget( val customPackage: String, val resources: List = emptyList(), val additionalSrcSets: List = emptyList(), + val compose: Boolean, ) : BazelBuildTarget { override fun statements(builder: StatementsBuilder) = builder { if (srcs.isNotEmpty()) { @@ -45,6 +46,7 @@ internal data class AndroidUnitTestTarget( tags = tags, customPackage = customPackage, resourcesGlob = resources, + enableCompose = compose, additionalSrcSets = additionalSrcSets, ) } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/dependencies/MavenInstallArtifactsCalculator.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/dependencies/MavenInstallArtifactsCalculator.kt index 3c22c8e1..15f35a99 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/dependencies/MavenInstallArtifactsCalculator.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/dependencies/MavenInstallArtifactsCalculator.kt @@ -18,10 +18,12 @@ package com.grab.grazel.migrate.dependencies import com.grab.grazel.GrazelExtension import com.grab.grazel.bazel.rules.MavenInstallArtifact -import com.grab.grazel.bazel.rules.MavenInstallArtifact.* -import com.grab.grazel.bazel.rules.MavenInstallArtifact.Exclusion.* -import com.grab.grazel.bazel.rules.MavenRepository.* +import com.grab.grazel.bazel.rules.MavenInstallArtifact.DetailedArtifact +import com.grab.grazel.bazel.rules.MavenInstallArtifact.Exclusion.SimpleExclusion +import com.grab.grazel.bazel.rules.MavenInstallArtifact.SimpleArtifact +import com.grab.grazel.bazel.rules.MavenRepository.DefaultMavenRepository import com.grab.grazel.gradle.RepositoryDataSource +import com.grab.grazel.gradle.dependencies.DefaultJetifierExclusions import com.grab.grazel.gradle.dependencies.model.ExcludeRule import com.grab.grazel.gradle.dependencies.model.ResolvedDependency import com.grab.grazel.gradle.dependencies.model.WorkspaceDependencies @@ -72,32 +74,34 @@ constructor( ): Set = workspaceDependencies.result .mapNotNullTo(TreeSet(compareBy(MavenInstallData::name))) { (variantName, artifacts) -> val mavenInstallName = variantName.toMavenRepoName() - val mavenInstallArtifacts = artifacts + val allArtifacts = artifacts + grazelExtension + .dependencies + .overrideArtifactVersions + .get() + .map { ResolvedDependency.fromId(it, mavenInstallName) } + .asSequence() + + val mavenInstallArtifacts = allArtifacts .mapTo(TreeSet(compareBy(MavenInstallArtifact::id)), ::toMavenInstallArtifact) .also { if (it.isEmpty()) return@mapNotNullTo null } val repositories = calculateRepositories(artifacts) // Overrides - val overridesFromExtension = mavenInstallExtension.overrideTargetLabels.get().toList() - val overridesFromArtifacts = artifacts - .mapNotNull(ResolvedDependency::overrideTarget) - .map { it.artifactShortId to it.label.toString() } - .toList() - val overrideTargets = (overridesFromArtifacts + overridesFromExtension) - .sortedWith( - compareBy(Pair::second).thenBy(Pair::first) - ).toMap() + val overrideTargets = calculateOverrideTargets(artifacts) val mavenInstallJson = layout .projectDirectory .file("${mavenInstallName}_install.json").asFile - val jetifierArtifacts = (artifacts - .asSequence() - .mapNotNull { - if (it.requiresJetifier) it.shortId else it.jetifierSource - }.toList() + mavenInstallExtension.jetifyIncludeList.get()).toSortedSet() + val jetifierArtifacts = ( + artifacts + .asSequence() + .mapNotNull { if (it.requiresJetifier) it.shortId else it.jetifierSource } + .toList() + + mavenInstallExtension.jetifyIncludeList.get() + - DefaultJetifierExclusions + ).toSortedSet() MavenInstallData( name = mavenInstallName, @@ -120,6 +124,21 @@ constructor( ) } + private fun calculateOverrideTargets( + artifacts: List + ): Map { + val artifactsShortIdMap = artifacts.groupBy { it.shortId } + val overridesFromExtension = mavenInstallExtension.overrideTargetLabels.get().toList() + val overridesFromArtifacts = artifacts + .asSequence() + .mapNotNull(ResolvedDependency::overrideTarget) + .map { it.artifactShortId to it.label.toString() } + return (overridesFromArtifacts + overridesFromExtension) + .filter { (shortId, _) -> shortId in artifactsShortIdMap } + .sortedBy { it.toString() } + .toMap() + } + private fun toMavenInstallArtifact(dependency: ResolvedDependency): MavenInstallArtifact { val (group, name, version) = dependency.id.split(":") val shortId = "${group}:${name}" @@ -165,7 +184,8 @@ constructor( .asSequence() .map { repositoryDataSource.allRepositoriesByName.getValue(it) } .sortedBy { - repositoryDataSource.allRepositoriesByName.entries.indexOf(it.name) // Preserve order + val name: String = it.name + repositoryDataSource.allRepositoriesByName.entries.indexOf(name) // Preserve order }.toSet() return gradleRepositories.map { it.toMavenRepository() }.toSet() } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/kotlin/UnitTestData.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/kotlin/UnitTestData.kt index 53bdcd05..ded8308b 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/kotlin/UnitTestData.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/kotlin/UnitTestData.kt @@ -40,6 +40,7 @@ internal fun UnitTestData.toUnitTestTarget(): BazelBuildTarget = associates = associates, customPackage = "", tags = tags, + compose = false, ) } else { UnitTestTarget( diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/AndroidDatabindingMetaDataTask.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/AndroidDatabindingMetaDataTask.kt index c61d3e88..b12dfb7f 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/AndroidDatabindingMetaDataTask.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/AndroidDatabindingMetaDataTask.kt @@ -24,11 +24,13 @@ import dagger.Lazy import org.gradle.api.DefaultTask import org.gradle.api.Project import org.gradle.api.tasks.TaskAction +import org.gradle.api.tasks.UntrackedTask import org.gradle.kotlin.dsl.register import org.jetbrains.kotlin.konan.file.File import java.util.zip.ZipFile import javax.inject.Inject +@UntrackedTask(because = "Up to dateness not implemented currently") internal open class AndroidDatabindingMetaDataTask @Inject constructor( diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/GenerateBazelScriptsTask.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/GenerateBazelScriptsTask.kt index 17216bf0..cc0de176 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/GenerateBazelScriptsTask.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/GenerateBazelScriptsTask.kt @@ -38,10 +38,12 @@ import org.gradle.api.tasks.Internal import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.TaskProvider +import org.gradle.api.tasks.UntrackedTask import org.gradle.kotlin.dsl.property import org.gradle.kotlin.dsl.register import javax.inject.Inject +@UntrackedTask(because = "Up to dateness not implemented correctly") internal open class GenerateBazelScriptsTask @Inject constructor( @@ -60,10 +62,6 @@ constructor( val dependencyResolutionService: Property = project.objects.property() - init { - outputs.upToDateWhen { false } // This task is supposed to run always until we figure out up-to-date checks - } - @get:OutputFile val buildBazel: RegularFileProperty = objectFactory.fileProperty().apply { set(layout.buildDirectory.file("grazel/$BUILD_BAZEL_IGNORE")) diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/GenerateRootBazelScriptsTask.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/GenerateRootBazelScriptsTask.kt index 321acad5..7139fc41 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/GenerateRootBazelScriptsTask.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/GenerateRootBazelScriptsTask.kt @@ -38,10 +38,12 @@ import org.gradle.api.tasks.InputFile import org.gradle.api.tasks.Internal import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction +import org.gradle.api.tasks.UntrackedTask import org.gradle.kotlin.dsl.property import org.gradle.kotlin.dsl.register import javax.inject.Inject +@UntrackedTask(because = "Up to dateness not implemented correctly") internal open class GenerateRootBazelScriptsTask @Inject constructor( @@ -52,10 +54,6 @@ constructor( layout: ProjectLayout ) : DefaultTask() { - init { - outputs.upToDateWhen { false } // This task is supposed to run always until we figure out up-to-date checks - } - @get:InputFile val workspaceDependencies: RegularFileProperty = project.objects.fileProperty() diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/ResolveVariantDependenciesTask.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/ResolveVariantDependenciesTask.kt index ae83018c..6b8ed2b3 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/ResolveVariantDependenciesTask.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/tasks/internal/ResolveVariantDependenciesTask.kt @@ -16,7 +16,6 @@ package com.grab.grazel.tasks.internal -import com.grab.grazel.gradle.dependencies.DefaultDependencyResolutionService import com.grab.grazel.gradle.dependencies.ResolvedComponentsVisitor import com.grab.grazel.gradle.dependencies.model.ExcludeRule import com.grab.grazel.gradle.dependencies.model.ResolveDependenciesResult @@ -40,7 +39,6 @@ import org.gradle.api.file.RegularFileProperty import org.gradle.api.provider.ListProperty import org.gradle.api.provider.MapProperty import org.gradle.api.provider.Property -import org.gradle.api.provider.Provider import org.gradle.api.tasks.CacheableTask import org.gradle.api.tasks.Input import org.gradle.api.tasks.InputFiles @@ -88,7 +86,7 @@ internal abstract class ResolveVariantDependenciesTask : DefaultTask() { init { group = GRAZEL_TASK_GROUP - description = "Resolves configurations and serialized them to be read on later" + description = "Resolves configurations and serializes them to be read on later" } private fun ListProperty.toResolvedDependencies( @@ -114,9 +112,10 @@ internal abstract class ResolveVariantDependenciesTask : DefaultTask() { shortId = shortId, direct = isDirect, version = version.version, - dependencies = dependencies.mapTo(TreeSet()) { (dependency, jetifierSource) -> + dependencies = dependencies.mapTo(TreeSet()) { (dependency, requiresJetifier, jetifierSource) -> ResolvedDependency.createDependencyNotation( dependency, + requiresJetifier, jetifierSource ) }, diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/util/GrazelJson.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/util/GrazelJson.kt index 5f1f4a87..d6a2bc29 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/util/GrazelJson.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/util/GrazelJson.kt @@ -1,13 +1,14 @@ package com.grab.grazel.util -import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream import org.gradle.api.file.RegularFile import java.io.File +import kotlinx.serialization.json.Json as KotlinJson // Inject? -internal val Json = Json { +internal val Json = KotlinJson { explicitNulls = false + ignoreUnknownKeys = true } internal inline fun fromJson(file: RegularFile): T = fromJson(file.asFile) diff --git a/grazel-gradle-plugin/src/test/kotlin/com/grab/grazel/gradle/DefaultDependenciesDataSourceTest.kt b/grazel-gradle-plugin/src/test/kotlin/com/grab/grazel/gradle/DefaultDependenciesDataSourceTest.kt index 4610a0ee..ead9b7f6 100644 --- a/grazel-gradle-plugin/src/test/kotlin/com/grab/grazel/gradle/DefaultDependenciesDataSourceTest.kt +++ b/grazel-gradle-plugin/src/test/kotlin/com/grab/grazel/gradle/DefaultDependenciesDataSourceTest.kt @@ -104,7 +104,7 @@ class DefaultDependenciesDataSourceTest { result = buildMap { put( "debug", listOf( - from("com.android.support:appcompat-v7:28.0.0:debug:false"), + from("com.android.support:appcompat-v7:28.0.0:debug:false:null"), ) ) } diff --git a/grazel-gradle-plugin/src/test/kotlin/com/grab/grazel/migrate/android/DefaultAndroidLibraryDataExtractorTest.kt b/grazel-gradle-plugin/src/test/kotlin/com/grab/grazel/migrate/android/DefaultAndroidLibraryDataExtractorTest.kt index de5d46d8..aac1c1df 100644 --- a/grazel-gradle-plugin/src/test/kotlin/com/grab/grazel/migrate/android/DefaultAndroidLibraryDataExtractorTest.kt +++ b/grazel-gradle-plugin/src/test/kotlin/com/grab/grazel/migrate/android/DefaultAndroidLibraryDataExtractorTest.kt @@ -79,8 +79,8 @@ class DefaultAndroidLibraryDataExtractorTest { result = buildMap { put( "maven", listOf( - from("com.android.databinding:viewbinding:1.0.0:maven:false"), - from("com.android.databinding:baseLibrary:1.0.0:maven:false") + from("com.android.databinding:viewbinding:1.0.0:maven:false:null"), + from("com.android.databinding:baseLibrary:1.0.0:maven:false:null") ) ) } diff --git a/grazel-gradle-plugin/src/test/kotlin/com/grab/grazel/migrate/dependencies/DefaultArtifactPinnerTest.kt b/grazel-gradle-plugin/src/test/kotlin/com/grab/grazel/migrate/dependencies/DefaultArtifactPinnerTest.kt index bdc79227..6bee1cfe 100644 --- a/grazel-gradle-plugin/src/test/kotlin/com/grab/grazel/migrate/dependencies/DefaultArtifactPinnerTest.kt +++ b/grazel-gradle-plugin/src/test/kotlin/com/grab/grazel/migrate/dependencies/DefaultArtifactPinnerTest.kt @@ -111,7 +111,7 @@ class DefaultArtifactPinnerTest { workspaceDependencies = WorkspaceDependencies(result = buildMap { put( DEFAULT_VARIANT, - listOf(ResolvedDependency.from("androidx.annotation:annotation:1.2.0:maven:false")) + listOf(ResolvedDependency.from("androidx.annotation:annotation:1.2.0:maven:false:null")) ) }), gradleServices = gradleServices, @@ -144,7 +144,7 @@ class DefaultArtifactPinnerTest { workspaceDependencies = WorkspaceDependencies(result = buildMap { put( DEFAULT_VARIANT, - listOf(ResolvedDependency.from("androidx.annotation:annotation:1.1.0:maven:false")) + listOf(ResolvedDependency.from("androidx.annotation:annotation:1.1.0:maven:false:null")) ) }), gradleServices = gradleServices, diff --git a/maven_install.json b/maven_install.json index 1ce87b65..0467ef60 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,10 +1,10 @@ { "dependency_tree": { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 684997308, - "__RESOLVED_ARTIFACTS_HASH": 781580720, + "__INPUT_ARTIFACTS_HASH": 1483382249, + "__RESOLVED_ARTIFACTS_HASH": 125425482, "conflict_resolution": { - "androidx.annotation:annotation:1.5.0": "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.5.0": "androidx.annotation:annotation:1.6.0" }, "dependencies": [ { @@ -153,7 +153,7 @@ "coord": "androidx.activity:activity-compose:1.7.2", "dependencies": [ "androidx.activity:activity-ktx:aar:1.7.2", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime-saveable:aar:1.4.3", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui:aar:1.4.3", @@ -189,7 +189,7 @@ "coord": "androidx.activity:activity-ktx:1.7.2", "dependencies": [ "androidx.activity:activity:aar:1.7.2", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.core:core-ktx:aar:1.2.0", "androidx.lifecycle:lifecycle-runtime-ktx:aar:2.6.1", "androidx.lifecycle:lifecycle-runtime:aar:2.6.1", @@ -230,7 +230,7 @@ { "coord": "androidx.activity:activity:1.7.2", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.collection:collection:1.1.0", @@ -255,7 +255,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.core:core:aar:1.10.1", "androidx.lifecycle:lifecycle-runtime:aar:2.6.1", @@ -330,34 +330,32 @@ "url": "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-jvm/1.6.0/annotation-jvm-1.6.0.jar" }, { - "coord": "androidx.annotation:annotation:1.7.0-alpha03", + "coord": "androidx.annotation:annotation:1.6.0", "dependencies": [ - "androidx.annotation:annotation-jvm:1.6.0", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10" ], "directDependencies": [ - "androidx.annotation:annotation-jvm:1.6.0", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" ], - "file": "v1/https/dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar", + "file": "v1/https/dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.6.0/annotation-1.6.0.jar", "mirror_urls": [ - "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar", - "https://repo.maven.apache.org/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar", - "https://maven.google.com/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar", - "https://repo1.maven.org/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar", - "https://oss.sonatype.org/content/repositories/snapshots/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar" + "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.6.0/annotation-1.6.0.jar", + "https://repo.maven.apache.org/maven2/androidx/annotation/annotation/1.6.0/annotation-1.6.0.jar", + "https://maven.google.com/androidx/annotation/annotation/1.6.0/annotation-1.6.0.jar", + "https://repo1.maven.org/maven2/androidx/annotation/annotation/1.6.0/annotation-1.6.0.jar", + "https://oss.sonatype.org/content/repositories/snapshots/androidx/annotation/annotation/1.6.0/annotation-1.6.0.jar" ], "packages": [], - "sha256": "b11676837cad011a5285d6074418649107ef25eba17131517e9557ef8c9984ed", - "url": "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.7.0-alpha03/annotation-1.7.0-alpha03.jar" + "sha256": "fbc64f5c44a7added8b6eab517cf7d70555e25153bf5d44a6ed9b0e5312f7de9", + "url": "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.6.0/annotation-1.6.0.jar" }, { "coord": "androidx.appcompat:appcompat-resources:1.6.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.core:core:aar:1.10.1", "androidx.interpolator:interpolator:aar:1.0.0", @@ -365,7 +363,7 @@ "androidx.vectordrawable:vectordrawable:aar:1.1.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.core:core:aar:1.10.1", "androidx.vectordrawable:vectordrawable-animated:aar:1.1.0", @@ -391,7 +389,7 @@ "dependencies": [ "androidx.activity:activity:aar:1.7.2", "androidx.annotation:annotation-experimental:aar:1.3.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.appcompat:appcompat-resources:aar:1.6.1", "androidx.collection:collection:1.1.0", "androidx.core:core-ktx:aar:1.2.0", @@ -415,7 +413,7 @@ ], "directDependencies": [ "androidx.activity:activity:aar:1.7.2", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.appcompat:appcompat-resources:aar:1.6.1", "androidx.collection:collection:1.1.0", "androidx.core:core-ktx:aar:1.2.0", @@ -449,10 +447,10 @@ { "coord": "androidx.arch.core:core-common:2.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -475,11 +473,11 @@ { "coord": "androidx.arch.core:core-runtime:2.1.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0" ], "exclusions": [ @@ -523,10 +521,10 @@ { "coord": "androidx.collection:collection:1.1.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -548,7 +546,7 @@ { "coord": "androidx.compose.animation:animation-core:1.2.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui-unit:aar:1.4.3", "androidx.compose.ui:ui-util:aar:1.4.3", @@ -557,7 +555,7 @@ "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui-unit:aar:1.4.3", "androidx.compose.ui:ui-util:aar:1.4.3", @@ -583,7 +581,7 @@ { "coord": "androidx.compose.animation:animation:1.2.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.animation:animation-core:aar:1.2.1", "androidx.compose.foundation:foundation-layout:aar:1.4.3", "androidx.compose.runtime:runtime:aar:1.4.3", @@ -593,7 +591,7 @@ "org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.animation:animation-core:aar:1.2.1", "androidx.compose.foundation:foundation-layout:aar:1.4.3", "androidx.compose.runtime:runtime:aar:1.4.3", @@ -645,7 +643,7 @@ { "coord": "androidx.compose.foundation:foundation-layout:1.4.3", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.animation:animation-core:aar:1.2.1", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui-unit:aar:1.4.3", @@ -657,7 +655,7 @@ "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.animation:animation-core:aar:1.2.1", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui-unit:aar:1.4.3", @@ -685,7 +683,7 @@ "coord": "androidx.compose.foundation:foundation:1.4.3", "dependencies": [ "androidx.activity:activity-ktx:aar:1.7.2", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.autofill:autofill:aar:1.0.0", @@ -725,7 +723,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.animation:animation:aar:1.2.1", "androidx.compose.foundation:foundation-layout:aar:1.4.3", "androidx.compose.runtime:runtime:aar:1.4.3", @@ -783,7 +781,7 @@ { "coord": "androidx.compose.material:material-ripple:1.4.3", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.animation:animation-core:aar:1.2.1", "androidx.compose.animation:animation:aar:1.2.1", "androidx.compose.foundation:foundation-layout:aar:1.4.3", @@ -820,7 +818,7 @@ "coord": "androidx.compose.material:material:1.4.3", "dependencies": [ "androidx.activity:activity-ktx:aar:1.7.2", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.autofill:autofill:aar:1.0.0", @@ -896,14 +894,14 @@ { "coord": "androidx.compose.runtime:runtime-saveable:1.4.3", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10", "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10" ], @@ -925,7 +923,7 @@ { "coord": "androidx.compose.runtime:runtime:1.4.3", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10", "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10", @@ -934,7 +932,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10", "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" ], @@ -956,7 +954,7 @@ { "coord": "androidx.compose.ui:ui-geometry:1.4.3", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui-util:aar:1.4.3", "org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10", @@ -964,7 +962,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui-util:aar:1.4.3", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10" @@ -987,14 +985,14 @@ { "coord": "androidx.compose.ui:ui-graphics:1.4.3", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui-unit:aar:1.4.3", "androidx.compose.ui:ui-util:aar:1.4.3", "org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui-unit:aar:1.4.3", "androidx.compose.ui:ui-util:aar:1.4.3", @@ -1018,7 +1016,7 @@ { "coord": "androidx.compose.ui:ui-text:1.4.3", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.compose.runtime:runtime-saveable:aar:1.4.3", "androidx.compose.runtime:runtime:aar:1.4.3", @@ -1035,7 +1033,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.compose.runtime:runtime-saveable:aar:1.4.3", "androidx.compose.runtime:runtime:aar:1.4.3", @@ -1066,7 +1064,7 @@ { "coord": "androidx.compose.ui:ui-tooling-data:1.4.3", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui:aar:1.4.3", "org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10", @@ -1074,7 +1072,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui:aar:1.4.3", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10" @@ -1097,14 +1095,14 @@ { "coord": "androidx.compose.ui:ui-tooling-preview:1.4.3", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10", "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10" ], @@ -1127,7 +1125,7 @@ "coord": "androidx.compose.ui:ui-tooling:1.4.3", "dependencies": [ "androidx.activity:activity-compose:aar:1.7.2", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.animation:animation:aar:1.2.1", "androidx.compose.material:material:aar:1.4.3", "androidx.compose.runtime:runtime:aar:1.4.3", @@ -1145,7 +1143,7 @@ ], "directDependencies": [ "androidx.activity:activity-compose:aar:1.7.2", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.animation:animation:aar:1.2.1", "androidx.compose.material:material:aar:1.4.3", "androidx.compose.runtime:runtime:aar:1.4.3", @@ -1174,7 +1172,7 @@ { "coord": "androidx.compose.ui:ui-unit:1.4.3", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui-geometry:aar:1.4.3", "androidx.compose.ui:ui-util:aar:1.4.3", @@ -1183,7 +1181,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.compose.runtime:runtime:aar:1.4.3", "androidx.compose.ui:ui-geometry:aar:1.4.3", "androidx.compose.ui:ui-util:aar:1.4.3", @@ -1233,7 +1231,7 @@ "coord": "androidx.compose.ui:ui:1.4.3", "dependencies": [ "androidx.activity:activity-ktx:aar:1.7.2", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.autofill:autofill:aar:1.0.0", @@ -1269,7 +1267,7 @@ ], "directDependencies": [ "androidx.activity:activity-ktx:aar:1.7.2", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.autofill:autofill:aar:1.0.0", "androidx.collection:collection:1.1.0", "androidx.compose.runtime:runtime-saveable:aar:1.4.3", @@ -1309,11 +1307,11 @@ { "coord": "androidx.concurrent:concurrent-futures:1.1.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" ], "exclusions": [ @@ -1340,11 +1338,11 @@ "exclusions": [ "androidx.test.espresso:espresso-contrib" ], - "file": "v1/https/maven.google.com/androidx/constraintlayout/constraintlayout-core/1.0.4/constraintlayout-core-1.0.4.jar", + "file": "v1/https/dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayout-core/1.0.4/constraintlayout-core-1.0.4.jar", "mirror_urls": [ - "https://maven.google.com/androidx/constraintlayout/constraintlayout-core/1.0.4/constraintlayout-core-1.0.4.jar", "https://dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayout-core/1.0.4/constraintlayout-core-1.0.4.jar", "https://repo.maven.apache.org/maven2/androidx/constraintlayout/constraintlayout-core/1.0.4/constraintlayout-core-1.0.4.jar", + "https://maven.google.com/androidx/constraintlayout/constraintlayout-core/1.0.4/constraintlayout-core-1.0.4.jar", "https://repo1.maven.org/maven2/androidx/constraintlayout/constraintlayout-core/1.0.4/constraintlayout-core-1.0.4.jar", "https://oss.sonatype.org/content/repositories/snapshots/androidx/constraintlayout/constraintlayout-core/1.0.4/constraintlayout-core-1.0.4.jar" ], @@ -1361,7 +1359,7 @@ "androidx.constraintlayout.core.widgets.analyzer" ], "sha256": "3e477f4de231e58b25f5a992f3be45e97d332c34a39a9e3e7d4b78ae0ac2256f", - "url": "https://maven.google.com/androidx/constraintlayout/constraintlayout-core/1.0.4/constraintlayout-core-1.0.4.jar" + "url": "https://dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayout-core/1.0.4/constraintlayout-core-1.0.4.jar" }, { "coord": "androidx.constraintlayout:constraintlayout:2.1.4", @@ -1376,27 +1374,27 @@ "androidx.core:core", "androidx.test.espresso:espresso-contrib" ], - "file": "v1/https/maven.google.com/androidx/constraintlayout/constraintlayout/2.1.4/constraintlayout-2.1.4.aar", + "file": "v1/https/dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayout/2.1.4/constraintlayout-2.1.4.aar", "mirror_urls": [ - "https://maven.google.com/androidx/constraintlayout/constraintlayout/2.1.4/constraintlayout-2.1.4.aar", "https://dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayout/2.1.4/constraintlayout-2.1.4.aar", "https://repo.maven.apache.org/maven2/androidx/constraintlayout/constraintlayout/2.1.4/constraintlayout-2.1.4.aar", + "https://maven.google.com/androidx/constraintlayout/constraintlayout/2.1.4/constraintlayout-2.1.4.aar", "https://repo1.maven.org/maven2/androidx/constraintlayout/constraintlayout/2.1.4/constraintlayout-2.1.4.aar", "https://oss.sonatype.org/content/repositories/snapshots/androidx/constraintlayout/constraintlayout/2.1.4/constraintlayout-2.1.4.aar" ], "packages": [], "sha256": "0df714c0b51e54710ebf746eb469d333176bbb3cb29f80775dc3ca4eb3162512", - "url": "https://maven.google.com/androidx/constraintlayout/constraintlayout/2.1.4/constraintlayout-2.1.4.aar" + "url": "https://dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayout/2.1.4/constraintlayout-2.1.4.aar" }, { "coord": "androidx.core:core-ktx:1.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.core:core:aar:1.10.1", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.core:core:aar:1.10.1", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10" ], @@ -1419,7 +1417,7 @@ "coord": "androidx.core:core:1.10.1", "dependencies": [ "androidx.annotation:annotation-experimental:aar:1.3.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.concurrent:concurrent-futures:1.1.0", "androidx.interpolator:interpolator:aar:1.0.0", @@ -1430,7 +1428,7 @@ ], "directDependencies": [ "androidx.annotation:annotation-experimental:aar:1.3.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.concurrent:concurrent-futures:1.1.0", "androidx.interpolator:interpolator:aar:1.0.0", @@ -1455,10 +1453,10 @@ { "coord": "androidx.cursoradapter:cursoradapter:1.0.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -1503,11 +1501,11 @@ { "coord": "androidx.customview:customview:1.0.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.core:core:aar:1.10.1" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.core:core:aar:1.10.1" ], "exclusions": [ @@ -1528,7 +1526,7 @@ { "coord": "androidx.databinding:databinding-adapters:7.2.2", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.databinding:databinding-common:7.2.2", "androidx.databinding:databinding-runtime:7.2.2", @@ -1578,7 +1576,7 @@ { "coord": "androidx.databinding:databinding-ktx:7.2.2", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.databinding:databinding-common:7.2.2", "androidx.databinding:databinding-runtime:7.2.2", @@ -1620,7 +1618,7 @@ { "coord": "androidx.databinding:databinding-runtime:7.2.2", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.databinding:databinding-common:7.2.2", "androidx.databinding:viewbinding:7.2.2", @@ -1650,10 +1648,10 @@ { "coord": "androidx.databinding:viewbinding:7.2.2", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -1673,12 +1671,12 @@ { "coord": "androidx.drawerlayout:drawerlayout:1.0.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.core:core:aar:1.10.1", "androidx.customview:customview:aar:1.0.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.core:core:aar:1.10.1", "androidx.customview:customview:aar:1.0.0" ], @@ -1700,7 +1698,7 @@ { "coord": "androidx.emoji2:emoji2-views-helper:aar:1.2.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.core:core:aar:1.10.1", "androidx.emoji2:emoji2:aar:1.3.0" @@ -1728,14 +1726,14 @@ { "coord": "androidx.emoji2:emoji2:1.3.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.core:core:aar:1.10.1", "androidx.lifecycle:lifecycle-process:aar:2.6.1", "androidx.startup:startup-runtime:aar:1.1.1" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.core:core:aar:1.10.1", "androidx.lifecycle:lifecycle-process:aar:2.6.1", @@ -1761,7 +1759,7 @@ "dependencies": [ "androidx.activity:activity:aar:1.7.2", "androidx.annotation:annotation-experimental:aar:1.3.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.core:core:aar:1.10.1", "androidx.customview:customview:aar:1.0.0", @@ -1776,7 +1774,7 @@ "directDependencies": [ "androidx.activity:activity:aar:1.7.2", "androidx.annotation:annotation-experimental:aar:1.3.0", - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.core:core:aar:1.10.1", "androidx.lifecycle:lifecycle-livedata-core:aar:2.6.1", @@ -1804,10 +1802,10 @@ { "coord": "androidx.interpolator:interpolator:1.0.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -1827,7 +1825,7 @@ { "coord": "androidx.lifecycle:lifecycle-common:2.6.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10", "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4", @@ -1835,7 +1833,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10", "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" ], @@ -1859,7 +1857,7 @@ { "coord": "androidx.lifecycle:lifecycle-livedata-core:2.6.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.lifecycle:lifecycle-common:2.6.1", @@ -1893,7 +1891,7 @@ { "coord": "androidx.lifecycle:lifecycle-livedata:2.6.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.lifecycle:lifecycle-livedata-core:aar:2.6.1", @@ -1925,7 +1923,7 @@ { "coord": "androidx.lifecycle:lifecycle-process:2.6.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.lifecycle:lifecycle-runtime:aar:2.6.1", "androidx.startup:startup-runtime:aar:1.1.1", "androidx.tracing:tracing:aar:1.0.0", @@ -1934,7 +1932,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.lifecycle:lifecycle-runtime:aar:2.6.1", "androidx.startup:startup-runtime:aar:1.1.1", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10" @@ -1957,7 +1955,7 @@ { "coord": "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.lifecycle:lifecycle-runtime:aar:2.6.1", "org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10", "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10", @@ -1967,7 +1965,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.lifecycle:lifecycle-runtime:aar:2.6.1", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10", "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" @@ -1990,7 +1988,7 @@ { "coord": "androidx.lifecycle:lifecycle-runtime:2.6.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.concurrent:concurrent-futures:1.1.0", @@ -2006,7 +2004,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0", "androidx.arch.core:core-runtime:aar:2.1.0", "androidx.lifecycle:lifecycle-common:2.6.1", @@ -2089,7 +2087,7 @@ { "coord": "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0", "androidx.core:core-ktx:aar:1.2.0", "androidx.core:core:aar:1.10.1", @@ -2105,7 +2103,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.core:core-ktx:aar:1.2.0", "androidx.lifecycle:lifecycle-livedata-core:aar:2.6.1", "androidx.lifecycle:lifecycle-viewmodel:aar:2.6.1", @@ -2131,13 +2129,13 @@ { "coord": "androidx.lifecycle:lifecycle-viewmodel:2.6.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10", "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10" ], "exclusions": [ @@ -2158,13 +2156,13 @@ { "coord": "androidx.loader:loader:1.0.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.core:core:aar:1.10.1", "androidx.lifecycle:lifecycle-livedata:aar:2.6.1", "androidx.lifecycle:lifecycle-viewmodel:aar:2.6.1" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.core:core:aar:1.10.1", "androidx.lifecycle:lifecycle-livedata:aar:2.6.1", "androidx.lifecycle:lifecycle-viewmodel:aar:2.6.1" @@ -2187,14 +2185,14 @@ { "coord": "androidx.profileinstaller:profileinstaller:aar:1.3.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.concurrent:concurrent-futures:1.1.0", "androidx.startup:startup-runtime:aar:1.1.1", "androidx.tracing:tracing:aar:1.0.0", "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.concurrent:concurrent-futures:1.1.0", "androidx.startup:startup-runtime:aar:1.1.1", "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" @@ -2217,10 +2215,10 @@ { "coord": "androidx.resourceinspection:resourceinspection-annotation:1.0.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -2269,7 +2267,7 @@ { "coord": "androidx.savedstate:savedstate:1.2.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0", "androidx.lifecycle:lifecycle-common:2.6.1", "org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10", @@ -2279,7 +2277,7 @@ "org.jetbrains:annotations:13.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.arch.core:core-common:2.2.0", "androidx.lifecycle:lifecycle-common:2.6.1", "org.jetbrains.kotlin:kotlin-stdlib:1.8.10" @@ -2302,11 +2300,11 @@ { "coord": "androidx.startup:startup-runtime:1.1.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.tracing:tracing:aar:1.0.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.tracing:tracing:aar:1.0.0" ], "exclusions": [ @@ -2327,10 +2325,10 @@ { "coord": "androidx.tracing:tracing:aar:1.0.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03" + "androidx.annotation:annotation:1.6.0" ], "exclusions": [ "androidx.test.espresso:espresso-contrib" @@ -2350,7 +2348,7 @@ { "coord": "androidx.vectordrawable:vectordrawable-animated:1.1.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.core:core:aar:1.10.1", "androidx.interpolator:interpolator:aar:1.0.0", @@ -2379,12 +2377,12 @@ { "coord": "androidx.vectordrawable:vectordrawable:1.1.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.core:core:aar:1.10.1" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0", "androidx.core:core:aar:1.10.1" ], @@ -2406,11 +2404,11 @@ { "coord": "androidx.versionedparcelable:versionedparcelable:1.1.1", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.collection:collection:1.1.0" ], "exclusions": [ @@ -2431,12 +2429,12 @@ { "coord": "androidx.viewpager:viewpager:1.0.0", "dependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.core:core:aar:1.10.1", "androidx.customview:customview:aar:1.0.0" ], "directDependencies": [ - "androidx.annotation:annotation:1.7.0-alpha03", + "androidx.annotation:annotation:1.6.0", "androidx.core:core:aar:1.10.1", "androidx.customview:customview:aar:1.0.0" ], diff --git a/sample-android/src/test/java/com/grab/grazel/android/sample/SimpleTest.kt b/sample-android/src/test/java/com/grab/grazel/android/sample/SimpleTest.kt new file mode 100644 index 00000000..01a1504e --- /dev/null +++ b/sample-android/src/test/java/com/grab/grazel/android/sample/SimpleTest.kt @@ -0,0 +1,26 @@ +/* + * Copyright 2023 Grabtaxi Holdings PTE LTD (GRAB) + * + * 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. + */ +package com.grab.grazel.android.sample + +import org.junit.Assert +import org.junit.Test + +class SimpleTest { + @Test + fun test() { + Assert.assertTrue(true ) + } +} \ No newline at end of file