Merge branch 'trunk' into task/prototype-domain

wordpress-mobile · Nov 7, 2024 · e49e7dd · e49e7dd
2 parents 36023f5 + 0fe0421
commit e49e7dd
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 40 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -299,7 +299,6 @@ android {
         checkGeneratedSources = true
         lintConfig file("${project.rootDir}/config/lint/lint.xml")
         baseline file("${project.rootDir}/config/lint/baseline.xml")
-        enable += 'UnknownNullness'
         sarifReport = System.getenv('CI') ? true : false
     }
 

diff --git a/config/lint/lint.xml b/config/lint/lint.xml
@@ -78,13 +78,6 @@
     </issue>
     <issue id="IconDensities" severity="warning" /> <!--    fluxc-->
     <!-- INTEROPERABILITY -->
-    <issue id="UnknownNullness" severity="informational">
-        <ignore path="**/generated/**" />
-    </issue>
-
     <!-- TODO: https://github.com/wordpress-mobile/WordPress-Android/issues/21065 -->
     <issue id="UsingMaterialAndMaterial3Libraries" severity="warning" />
-    <!--  We rely on more granural checks from WordPress-Lint-Android  -->
-    <issue id="UnknownNullness" severity="ignore" />
-
 </lint>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agp = '8.5.1'
 airbnb-lottie = '6.6.0'
-android-desugar = '2.1.2'
+android-desugar = '2.1.3'
 android-installreferrer = '2.2'
 android-security-lint = '1.0.3'
 android-volley = '1.2.1'
@@ -77,6 +77,7 @@ gutenberg-mobile = 'v1.121.0'
 indexos-media-for-mobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a'
 jackson-databind = '2.12.7.1'
 jetty-webapp = '9.4.51.v20230217'
+jna = '5.15.0@aar'
 json-path = '2.9.0'
 jsoup = '1.18.1'
 junit = '4.13.2'
@@ -95,6 +96,7 @@ squareup-java-poet = '1.13.0'
 squareup-kotlin-poet = '1.18.1'
 squareup-okhttp3 = '4.12.0'
 squareup-retrofit = '2.11.0'
+terl-lazysodium-android = '5.0.2@aar'
 wellsql = '2.0.0'
 wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
@@ -226,6 +228,7 @@ indexos-media-for-mobile-android = { group = "com.github.indexos.media-for-mobil
 indexos-media-for-mobile-domain = { group = "com.github.indexos.media-for-mobile", name = "domain", version.ref = "indexos-media-for-mobile" }
 jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson-databind" }
 jetty-webapp = { group = "org.eclipse.jetty", name = "jetty-webapp", version.ref = "jetty-webapp" }
+jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
 json-path = { group = "com.jayway.jsonpath", name = "json-path", version.ref = "json-path" }
 jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
@@ -249,6 +252,7 @@ squareup-kotlin-poet-main = { group = "com.squareup", name = "kotlinpoet", versi
 squareup-okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "squareup-okhttp3" }
 squareup-okhttp3-urlconnection = { module = "com.squareup.okhttp3:okhttp-urlconnection", version.ref = "squareup-okhttp3" }
 squareup-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "squareup-retrofit" }
+terl-lazysodium-android = { module = "com.goterl:lazysodium-android", version.ref = "terl-lazysodium-android" }
 wellsql = { module = "org.wordpress:wellsql", version.ref = "wellsql" }
 wellsql-processor = { module = "org.wordpress.wellsql:wellsql-processor", version.ref = "wellsql" }
 wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref = "wiremock" }

diff --git a/libs/analytics/build.gradle b/libs/analytics/build.gradle
@@ -19,8 +19,4 @@ android {
         targetSdkVersion rootProject.targetSdkVersion
         compileSdk rootProject.compileSdkVersion
     }
-
-    lint {
-        enable += 'UnknownNullness'
-    }
 }
diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
@@ -14,10 +14,6 @@ android {
         compileSdk rootProject.compileSdkVersion
     }
 
-    lint {
-        enable += 'UnknownNullness'
-    }
-
     // Avoid 'duplicate files during packaging of APK' errors
     packagingOptions {
         exclude 'LICENSE.txt'

diff --git a/libs/fluxc/build.gradle b/libs/fluxc/build.gradle
@@ -25,11 +25,6 @@ android {
         consumerProguardFiles 'consumer-rules.pro'
     }
 
-    lint {
-        enable += 'UnknownNullness'
-        disable 'UseTomlInstead', 'IgnoreWithoutReason'
-    }
-
     testOptions {
         unitTests.includeAndroidResources = true
     }
@@ -107,8 +102,8 @@ dependencies {
     implementation libs.kotlinx.coroutines.android
 
     // Encrypted Logging
-    api "com.goterl:lazysodium-android:5.0.2@aar"
-    api "net.java.dev.jna:jna:5.15.0@aar"
+    api(libs.terl.lazysodium.android.get().toString()) // TODO: https://github.com/gradle/gradle/issues/21267
+    api(libs.jna.get().toString()) // TODO: https://github.com/gradle/gradle/issues/21267
 
     // Unit tests
     testImplementation libs.junit

diff --git a/libs/fluxc/src/test/java/org/wordpress/android/fluxc/store/StatsStoreTest.kt b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/store/StatsStoreTest.kt
@@ -172,6 +172,7 @@ class StatsStoreTest {
     }
 
     @Test @Ignore
+    @Suppress("IgnoreWithoutReason")
     fun `insight types starts with news type and ends with control type when news card was not shown`() = test {
         whenever(insightTypesSqlUtils.selectAddedItemsOrderedByStatus(site)).thenReturn(listOf(COMMENTS))
         whenever(sharedPreferences.getBoolean(INSIGHTS_MANAGEMENT_NEWS_CARD_SHOWN, false)).thenReturn(false)
@@ -185,6 +186,7 @@ class StatsStoreTest {
     }
 
     @Test @Ignore
+    @Suppress("IgnoreWithoutReason")
     fun `insight types does not start with news type when news card was shown`() = test {
         whenever(insightTypesSqlUtils.selectAddedItemsOrderedByStatus(site)).thenReturn(listOf(COMMENTS))
         whenever(sharedPreferences.getBoolean(INSIGHTS_MANAGEMENT_NEWS_CARD_SHOWN, false)).thenReturn(true)

diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle
@@ -29,10 +29,6 @@ android {
         }
     }
 
-    lint {
-        enable += 'UnknownNullness'
-    }
-
     buildFeatures {
         viewBinding true
     }

diff --git a/libs/login/build.gradle b/libs/login/build.gradle
@@ -16,10 +16,6 @@ android {
     buildFeatures {
         buildConfig true
     }
-    lint {
-        enable += 'UnknownNullness'
-        disable 'UseTomlInstead'
-    }
 }
 
 dependencies {

diff --git a/libs/mocks/build.gradle b/libs/mocks/build.gradle
@@ -10,10 +10,6 @@ android {
         targetSdkVersion rootProject.targetSdkVersion
         compileSdk rootProject.compileSdkVersion
     }
-
-    lint {
-        enable += 'UnknownNullness'
-    }
 }
 
 dependencies {

diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle
@@ -10,10 +10,6 @@ android {
         targetSdkVersion rootProject.targetSdkVersion
         compileSdk rootProject.compileSdkVersion
     }
-
-    lint {
-        enable += 'UnknownNullness'
-    }
 }
 
 dependencies {