Merge pull request #129 from wordpress-mobile/build/enable-non-transitive-resources

[Build] Enable Non-Transitive Resources

Author: ParaskP7

.buildkite/pipeline.yml

@@ -17,7 +17,7 @@ steps:
     plugins: *common_plugins
     command: |
       cp gradle.properties-example gradle.properties
-      ./gradlew lint checkstyle
+      ./gradlew lintRelease checkstyle
     artifact_paths:
       - "**/build/reports/lint-results.*"
       - "**/build/reports/checkstyle/checkstyle.*"
@@ -27,7 +27,7 @@ steps:
     plugins: *common_plugins
     command: |
       cp gradle.properties-example gradle.properties
-      ./gradlew test
+      ./gradlew testRelease
 
   - label: "Build and upload to S3"
     depends_on:

WordPressUtils/build.gradle

@@ -19,19 +19,17 @@ dependencies {
     implementation "org.greenrobot:eventbus:$eventBusVersion"
 
     implementation "androidx.core:core-ktx:$androidxCoreVersion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$gradle.ext.kotlinVersion"
 
     testImplementation "junit:junit:$junitVersion"
     testImplementation "org.assertj:assertj-core:$assertjVersion"
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "androidx.test:core:$androidxTestCoreVersion"
 
     lintChecks "org.wordpress:lint:$wordpressLintVersion"
+
     androidTestImplementation "androidx.test:runner:$androidxTestCoreVersion"
     androidTestImplementation "androidx.test:rules:$androidxTestCoreVersion"
     androidTestImplementation "androidx.test.ext:junit:$jUnitExtVersion"
-    androidTestImplementation "com.android.support.test.uiautomator:uiautomator-v18:$uiAutomatorVersion"
-
 }
 
 android {

build.gradle

@@ -50,7 +50,8 @@ ext {
     androidxTestCoreVersion = '1.4.0'
     assertjVersion = '3.11.1'
     junitVersion = '4.12'
-    jUnitExtVersion = '1.1.3'
     robolectricVersion = '4.9'
-    uiAutomatorVersion = '2.1.2'
+
+    // android test
+    jUnitExtVersion = '1.1.3'
 }

gradle.properties-example

@@ -1 +1,6 @@
+# WordPress-Utils-Android properties.
+
 android.useAndroidX=true
+android.enableJetifier=false
+
+android.nonTransitiveRClass=true

settings.gradle

@@ -1,11 +1,12 @@
 pluginManagement {
     gradle.ext.kotlinVersion = '1.6.10'
     gradle.ext.agpVersion = '7.2.1'
+    gradle.ext.automatticPublishToS3Version = '0.7.0'
 
     plugins {
         id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion
         id "com.android.library" version gradle.ext.agpVersion
-        id "com.automattic.android.publish-to-s3" version "0.7.0"
+        id "com.automattic.android.publish-to-s3" version gradle.ext.automatticPublishToS3Version
     }
     repositories {
         maven {