Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor jetifier calculation, enable compose in unit tests and declare @UntrackedTask for tasks that don't support up to date checks #114

Closed
wants to merge 1 commit into from
Closed

Refactor jetifier calculation, enable compose in unit tests and declare @UntrackedTask for tasks that don't support up to date checks #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -113,19 +113,23 @@ 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 = {
"androidx.annotation:annotation": "@maven//:androidx_annotation_annotation_jvm",
"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/",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -208,14 +214,14 @@ 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",
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": "@maven//:org_jetbrains_kotlin_kotlin_stdlib_jdk8",
"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/",
Expand All @@ -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",
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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/",
],
Expand Down
90 changes: 30 additions & 60 deletions android_test_maven_install.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
{
Expand All @@ -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": [
Expand All @@ -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"
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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"
],
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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"
Expand Down
13 changes: 9 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -103,7 +102,7 @@ grazel {
}
bazelCommon {
gitRepository {
commit = "421f7a883add946c6a59e356e8e51800c44fb7a1"
commit = "2abb41f0fae9f9c973ca176e9b6b4b73928de2f8"
remote = "https://github.com/grab/grab-bazel-common.git"
}
toolchains {
Expand All @@ -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)
Expand Down
Loading
Loading