Update LeakCanary to 2.10

CHANGELOG.md

@@ -88,6 +88,24 @@
 * [Android] Open lifecycleFlow, thus enabling it for mocking 
 * [Android] [WorkerBinder] Guard against potential Worker.coroutineContext being null while using Mockito
 
-### Version 0.14.2i
+### Version 0.14.2
 * [Android] Fix potential for deadlocks in `Worker` binding. by @psteiger in https://github.com/uber/RIBs/pull/582
 * [Android] Add  Rib Worker demo app by @FranAguilera in https://github.com/uber/RIBs/pull/575
+
+### Version 0.15.0
+* Only complete the worker's scope after calling `Worker.onStop` by @psteiger in https://github.com/uber/RIBs/pull/585
+* Improve KDoc on `ActivityLifecycleEvent` by explaining ordering semantics. by @psteiger in https://github.com/uber/RIBs/pull/586
+* Make use of `jvmToolchain` for building the project. by @psteiger in https://github.com/uber/RIBs/pull/583
+* Revamp Gradle scripts by @psteiger in https://github.com/uber/RIBs/pull/588
+* Deprecate old worker by @FranAguilera in https://github.com/uber/RIBs/pull/597
+* Allow overriding default CoroutineDispatcher for WorkerBinder calls by @FranAguilera in https://github.com/uber/RIBs/pull/596
+* Update README.md by @FranAguilera in https://github.com/uber/RIBs/pull/600
+* Deprecate WorkerUnbinder by @FranAguilera in https://github.com/uber/RIBs/pull/601
+* Expose ribActionEvents stream by @FranAguilera in https://github.com/uber/RIBs/pull/599
+
+### Version 0.15.1
+* [Android] Remove use of @JvmDefault in favor of using -Xjvm-default=all by @psteiger in https://github.com/uber/RIBs/pull/576
+
+### Version 0.15.2
+* [Android] Set view tree owners for RibActivity
+

README.md

@@ -22,7 +22,7 @@ To get started with RIBs, please refer to the [RIBs documentation](https://githu
 
 To get more hands on with RIBs, we have written a [series of tutorials](https://github.com/uber/RIBs/wiki) that run you through the main aspects of the architecture with hands-on examples.
 
-To read about the backstory on why we created RIBs, see [this blog post](https://eng.uber.com/new-rider-app/) we wrote when releasing RIBs in production the first time and see [this short video](https://www.youtube.com/watch?v=Q5cTT0M0YXg) where we discussed how the RIBs architecture works.
+To read about the backstory on why we created RIBs, see [this blog post](https://www.uber.com/blog/new-rider-app-architecture/) we wrote when releasing RIBs in production the first time and see [this short video](https://www.youtube.com/watch?v=Q5cTT0M0YXg) where we discussed how the RIBs architecture works.
 
 #### What is the difference between RIBs and MV*/VIPER?
 
@@ -49,9 +49,9 @@ To integrate the recommended minimum setup for RIBs add the following to your `b
 
 ```gradle
 dependencies {
-  annotationProcessor 'com.uber.rib:rib-compiler-test:0.14.2'
-  implementation 'com.uber.rib:rib-android:0.14.2'
-  testImplementation 'com.uber.rib:rib-test:0.14.2'
+  annotationProcessor 'com.uber.rib:rib-compiler-test:0.15.2'
+  implementation 'com.uber.rib:rib-android:0.15.2'
+  testImplementation 'com.uber.rib:rib-test:0.15.2'
 }
 ```
 There are a number of extension packages available as well including Kotlin extensions, Jetpack Compose support, Coroutines support

android/build.gradle

@@ -13,186 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import net.ltgt.gradle.errorprone.CheckSeverity
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-
-
-buildscript {
-    apply from: rootProject.file('gradle/dependencies.gradle')
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath deps.build.gradlePlugins.android
-        classpath deps.build.gradlePlugins.errorprone
-        classpath deps.build.gradlePlugins.kotlin
-        classpath deps.build.gradlePlugins.spotless
-        classpath deps.build.gradlePlugins.gradleMavenPublish
-    }
+plugins {
+    alias(libs.plugins.androidApplication) apply false
+    alias(libs.plugins.androidLibrary) apply false
+    alias(libs.plugins.kotlinAndroid) apply false
+    alias(libs.plugins.kotlinKapt) apply false
+    alias(libs.plugins.mavenPublish) apply false
+    alias(libs.plugins.errorprone) apply false
+    alias(libs.plugins.nullaway) apply false
+    alias(libs.plugins.intellij) apply false
+    alias(libs.plugins.spotless) apply false
 }
-
-Set<String> useErrorProneProjects = [
-        "memory-leaks",
-        "tutorial1",
-        "tutorial2"
-]
-
-def moduleFriends = [
-        'rib-android': 'rib-base',
-        'rib-debug-utils': 'rib-base',
-        'rib-router-navigator': 'rib-base',
-        'rib-test': 'rib-base',
-        'rib-workflow-test': 'rib-workflow',
-        'rib-coroutines-test': 'rib-coroutines'
-]
-
-subprojects {
-    buildscript {
-        repositories {
-            google()
-            mavenCentral()
-            gradlePluginPortal()
-        }
-    }
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    apply plugin: 'com.diffplug.spotless'
-    spotless {
-        format 'misc', {
-            target '**/*.md', '**/.gitignore'
-
-            trimTrailingWhitespace()
-            endWithNewline()
-        }
-        kotlin {
-            target "**/*.kt"
-            ktlint(deps.versions.ktlint).editorConfigOverride(['indent_size': '2', 'continuation_indent_size' : '4'])
-            ktfmt(deps.versions.ktfmt).googleStyle()
-            licenseHeaderFile rootProject.file('config/spotless/copyright.kt')
-            trimTrailingWhitespace()
-            endWithNewline()
-        }
-        java {
-            target "src/*/java/**/*.java"
-            googleJavaFormat(deps.versions.gjf)
-            licenseHeaderFile rootProject.file('config/spotless/copyright.java')
-            removeUnusedImports()
-            trimTrailingWhitespace()
-            endWithNewline()
-        }
-        groovyGradle {
-            target '**/*.gradle'
-            trimTrailingWhitespace()
-            endWithNewline()
-        }
-    }
-
-    afterEvaluate {
-        boolean isAndroidApp = project.plugins.hasPlugin("com.android.application")
-        boolean isAndroidLibrary = project.plugins.hasPlugin("com.android.library")
-        boolean isIntelliJPlugin = project.plugins.hasPlugin("com.android.library")
-        boolean usesErrorProne = project.name in useErrorProneProjects
-        boolean isKotlinLibrary = project.plugins.hasPlugin("org.jetbrains.kotlin.jvm") || project.plugins.hasPlugin("org.jetbrains.kotlin.android")
-
-        if ((isAndroidLibrary || isAndroidApp) && usesErrorProne) {
-            def configurer = { variant ->
-                variant.getJavaCompileProvider().configure {
-                    options.errorprone.nullaway {
-                        severity = CheckSeverity.ERROR
-                        annotatedPackages.add("com.uber")
-                    }
-                    options.errorprone.excludedPaths = ".*/build/generated/.*"
-                }
-            }
-            if (isAndroidLibrary) {
-                project.android.libraryVariants.configureEach(configurer)
-            }
-            if (isAndroidApp) {
-                project.android.applicationVariants.configureEach(configurer)
-            }
-            project.android.testVariants.configureEach(configurer)
-            project.android.unitTestVariants.configureEach(configurer)
-        }
-        if (isAndroidLibrary || isAndroidApp) {
-            // TODO replace with https://issuetracker.google.com/issues/72050365 once released.
-            project.android {
-                if (isAndroidLibrary) {
-                    variantFilter { variant ->
-                        if (variant.buildType.name == 'debug') {
-                            variant.setIgnore(true)
-                        }
-                    }
-                }
-                if (isAndroidApp) {
-                    buildTypes {
-                        debug {
-                            matchingFallbacks = ['release']
-                        }
-                    }
-                    variantFilter { variant ->
-                        if (variant.buildType.name == "release") {
-                            variant.setIgnore(true)
-                        }
-                    }
-                }
-            }
-        }
-
-        if (isKotlinLibrary) {
-            def extraCompilerArgs = [
-                    // See https://github.com/bazelbuild/bazel/issues/15144
-                    "-Xjvm-default=enable",
-                    "-opt-in=kotlin.RequiresOptIn",
-            ]
-            if (project.name in moduleFriends.keySet()) {
-                def friendName = moduleFriends[project.name]
-                def friendProject = rootProject.subprojects.stream().filter { it.name == friendName }.findFirst().get()
-                def outputJarPath = friendProject.plugins.hasPlugin("com.android.library")
-                        ? "build/intermediates/compile_library_classes_jar/release/classes.jar"
-                        : "build/libs/$friendName-${project.property('VERSION_NAME')}.jar"
-                def friendPath="${project.rootDir}/libraries/${moduleFriends[project.name]}/$outputJarPath"
-                extraCompilerArgs.add("-Xfriend-paths=$friendPath")
-            }
-            if (isAndroidLibrary || isAndroidApp) {
-                project.android.sourceSets {
-                    main.java.srcDirs += 'src/main/kotlin'
-                    test.java.srcDirs += 'src/test/kotlin'
-                    androidTest.java.srcDirs += 'src/androidTest/kotlin'
-                }
-
-                tasks.withType(KotlinCompile).configureEach {
-                    kotlinOptions {
-                        freeCompilerArgs = extraCompilerArgs
-                        jvmTarget = "11"
-                    }
-                }
-            } else if(!isIntelliJPlugin) {
-                project.compileKotlin {
-                    kotlinOptions {
-                        freeCompilerArgs = extraCompilerArgs
-                        jvmTarget = "11"
-                    }
-                }
-                project.compileTestKotlin {
-                    kotlinOptions {
-                        freeCompilerArgs = extraCompilerArgs
-                        jvmTarget = "11"
-                    }
-                }
-            }
-        }
-    }
-}
-
-tasks.register('clean', Delete) {
-    delete rootProject.buildDir
-}
-
-apply from: rootProject.file('gradle/japicmp.gradle')

android/conventions/build.gradle.kts

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2023. Uber Technologies
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+plugins {
+    `kotlin-dsl`
+    `kotlin-dsl-precompiled-script-plugins`
+}
+
+repositories {
+    google()
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+dependencies {
+    // Workaround for using version catalog on precompiled scripts.
+    // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+    implementation(gradleApi())
+    implementation(libs.gradle.android.plugin)
+    implementation(libs.gradle.kotlin.plugin)
+    implementation(libs.gradle.errorprone.plugin)
+    implementation(libs.gradle.nullaway.plugin)
+    implementation(libs.gradle.spotless.plugin)
+}

android/demos/rib-workers/src/main/kotlin/com/uber/rib/workers/root/main/workers/monitoring/BackendReporter.kt → android/conventions/settings.gradle.kts

@@ -13,8 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.uber.rib.workers.root.main.workers.monitoring
-
-fun interface BackendReporter {
-  fun report(genericMessage: String)
+dependencyResolutionManagement {
+  versionCatalogs {
+    create("libs") {
+      from(files("../gradle/libs.versions.toml"))
+    }
+  }
 }
+
+rootProject.name = "conventions"

android/conventions/src/main/kotlin/Extensions.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2023. Uber Technologies
+ *
+ * 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.
+ */
+import com.android.build.gradle.AbstractAppExtension
+import com.android.build.gradle.LibraryExtension
+import com.android.build.gradle.TestedExtension
+import com.android.build.gradle.api.BaseVariant
+import net.ltgt.gradle.errorprone.CheckSeverity
+import net.ltgt.gradle.errorprone.errorprone
+import net.ltgt.gradle.nullaway.nullaway
+
+fun AbstractAppExtension.errorprone() {
+  applicationVariants.configureEach { errorprone() }
+  testErrorprone()
+}
+
+fun LibraryExtension.errorprone() {
+  libraryVariants.configureEach { errorprone() }
+  testErrorprone()
+}
+
+fun TestedExtension.testErrorprone() {
+  testVariants.configureEach { errorprone() }
+  unitTestVariants.configureEach { errorprone() }
+}
+
+fun BaseVariant.errorprone() {
+  javaCompileProvider.configure {
+    options.errorprone.nullaway {
+      severity.set(CheckSeverity.ERROR)
+      annotatedPackages.add("com.uber")
+    }
+    options.errorprone.excludedPaths.set(".*/build/generated/.*")
+  }
+}