Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-FluxC-A…

…ndroid into analysis/add-missing-nullability-annotations-to-media-client-classes
wordpress-mobile · Oct 25, 2023 · b93600e · b93600e
2 parents 3334cf0 + 09842f3
commit b93600e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/example/build.gradle b/example/build.gradle
@@ -164,6 +164,8 @@ dependencies {
     // Coroutines
     implementation sharedLibs.kotlinx.coroutines.core
     implementation sharedLibs.kotlinx.coroutines.android
+
+    lintChecks sharedLibs.wordpress.lint
 }
 
 def loadPropertiesOrUseExampleProperties(fileName, warningDetail) {

diff --git a/fluxc/build.gradle b/fluxc/build.gradle
@@ -130,6 +130,8 @@ dependencies {
     testImplementation sharedLibs.mockito.kotlin
     testImplementation sharedLibs.mockito.inline
     testImplementation sharedLibs.assertj.core
+
+    lintChecks sharedLibs.wordpress.lint
 }
 
 project.afterEvaluate {

diff --git a/plugins/woocommerce/build.gradle b/plugins/woocommerce/build.gradle
@@ -100,6 +100,8 @@ dependencies {
     androidTestImplementation sharedLibs.androidx.test.runner
     androidTestImplementation sharedLibs.androidx.test.ext.junit
     androidTestImplementation sharedLibs.assertj.core
+
+    lintChecks sharedLibs.wordpress.lint
 }
 
 project.afterEvaluate {

diff --git a/settings.gradle b/settings.gradle
@@ -21,7 +21,7 @@ plugins {
     id 'com.gradle.enterprise' version '3.9'
 }
 
-def catalogVersion = "1.14.0"
+def catalogVersion = "1.15.0"
 dependencyResolutionManagement {
     repositories {
         exclusiveContent {