fix: duplicate .so resources on cold builds (#414)

* fix: duplicate .so resources on cold builds

* fix(ci): fix Android CI cache gates to run whenever gradle plugin files are changed

* chore: bump BGP

* chore: changeset

---------

Co-authored-by: Hur Ali <hurali97@gmail.com>

Author: artus9033

.changeset/plenty-camels-pay.md

@@ -0,0 +1,5 @@
+---
+'@callstack/react-native-brownfield': patch
+---
+
+fix: duplicated JNI libs on cold publish

.github/workflows/ci.yml

@@ -26,6 +26,7 @@ jobs:
       expo56: ${{ steps.filter.outputs.expo56 }}
       androidapp: ${{ steps.filter.outputs.androidapp }}
       appleapp: ${{ steps.filter.outputs.appleapp }}
+      gradle-plugins: ${{ steps.filter.outputs.gradle-plugins }}
       ci: ${{ steps.filter.outputs.ci }}
     steps:
       - name: Checkout
@@ -52,6 +53,8 @@ jobs:
             appleapp:
               - 'apps/AppleApp/**'
               - 'apps/brownfield-example-shared-tests/**'
+            gradle-plugins:
+              - 'gradle-plugins/**'
             ci:
               - '.github/**'
 
@@ -139,6 +142,7 @@ jobs:
         needs.filter.outputs.expo56 == 'true' ||
         needs.filter.outputs.androidapp == 'true' ||
         needs.filter.outputs.packages == 'true' ||
+        needs.filter.outputs.gradle-plugins == 'true' ||
         needs.filter.outputs.ci == 'true'
       ) &&
       (needs.build-lint.result == 'success' || needs.build-lint.result == 'skipped')
@@ -169,6 +173,7 @@ jobs:
         needs.filter.outputs.rnapp == 'true' ||
         needs.filter.outputs.androidapp == 'true' ||
         needs.filter.outputs.packages == 'true' ||
+        needs.filter.outputs.gradle-plugins == 'true' ||
         needs.filter.outputs.ci == 'true'
       ) &&
       (needs.build-lint.result == 'success' || needs.build-lint.result == 'skipped')

apps/RNApp/android/build.gradle

@@ -16,7 +16,7 @@ buildscript {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
-        classpath("com.callstack.react:brownfield-gradle-plugin:2.0.0-alpha04-SNAPSHOT")
+        classpath("com.callstack.react:brownfield-gradle-plugin:2.0.0-alpha05-SNAPSHOT")
     }
 }
 

apps/scripts/prepare-android-build-gradle-for-ci.ts

@@ -9,7 +9,7 @@ if (!projectDirName) {
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-const SNAPSHOT_VERSION = '2.0.0-alpha04-SNAPSHOT';
+const SNAPSHOT_VERSION = '2.0.0-alpha05-SNAPSHOT';
 const targetPath = path.resolve(
   __dirname,
   '..',

gradle-plugins/react/brownfield/gradle.properties

@@ -1,6 +1,6 @@
 PROJECT_ID=com.callstack.react.brownfield
 ARTIFACT_ID=brownfield-gradle-plugin
-VERSION=2.0.0-alpha04
+VERSION=2.0.0-alpha05
 GROUP=com.callstack.react
 IMPLEMENTATION_CLASS=com.callstack.react.brownfield.plugin.RNBrownfieldPlugin
 

gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/plugin/RNSourceSets.kt

@@ -71,7 +71,14 @@ object RNSourceSets {
                 val appBuildDir = getAppBuildDir()
                 sourceSet.assets.srcDirs(bundlePathSegments.map { "$appBuildDir/generated/assets/$it" })
                 sourceSet.res.srcDirs(bundlePathSegments.map { "$appBuildDir/generated/res/$it" })
-                sourceSet.jniLibs.srcDirs("libs${variantName.capitalized()}")
+                if (extension.useStrippedSoFiles) {
+                    val capitalizedVariantName = variantName.capitalized()
+                    val libsDir = project.layout.projectDirectory.dir("libs$capitalizedVariantName")
+                    val copyTaskName = "copy${capitalizedVariantName}LibSources"
+                    sourceSet.jniLibs.srcDir(
+                        project.files(libsDir).builtBy(copyTaskName),
+                    )
+                }
                 if (Utils.hasExpoUpdates(appProject, variant.name)) {
                     val updateResourcesTask = appProject.tasks.named(updateResourcesPathSegment)
                     sourceSet.assets.srcDir(

gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/JNILibsProcessor.kt

@@ -25,11 +25,9 @@ class JNILibsProcessor(val project: Project) {
         }
 
         val androidExtension = project.extensions.getByName("android") as LibraryExtension
-        val copyTask = copySoLibsTask(variantName)
+        copySoLibsTask(variantName)
 
         mergeJniLibsTask.configure {
-            it.dependsOn(copyTask)
-
             it.doFirst {
                 val projectExt = project.extensions.getByType(Extension::class.java)
                 val existingJNILibs =

packages/react-native-brownfield/src/expo-config-plugin/android/__tests__/gradleHelpers.test.ts

@@ -16,7 +16,7 @@ describe('gradleHelpers', () => {
 }`;
 
     expect(modifyRootBuildGradle(contents)).toContain(
-      'classpath("com.callstack.react:brownfield-gradle-plugin:2.0.0-alpha04")'
+      'classpath("com.callstack.react:brownfield-gradle-plugin:2.0.0-alpha05")'
     );
   });
 

packages/react-native-brownfield/src/expo-config-plugin/android/utils/constants.ts

@@ -1,2 +1,2 @@
-export const BROWNFIELD_PLUGIN_VERSION = '2.0.0-alpha04';
+export const BROWNFIELD_PLUGIN_VERSION = '2.0.0-alpha05';
 export const brownfieldGradlePluginDependency = `classpath("com.callstack.react:brownfield-gradle-plugin:${BROWNFIELD_PLUGIN_VERSION}")`;

scripts/__tests__/generate-brownfield-gradle-plugin-release-notes.test.ts

@@ -25,14 +25,14 @@ test('supports prerelease versions when finding the previous plugin tag', () =>
   const previousTag = findPreviousPluginTag(
     [
       'brownfield-gradle-plugin/v2.0.0-alpha01',
-      'brownfield-gradle-plugin/v2.0.0-alpha04',
+      'brownfield-gradle-plugin/v2.0.0-alpha05',
       'brownfield-gradle-plugin/v2.0.0-beta01',
       'brownfield-gradle-plugin/v2.0.0',
     ],
     '2.0.0-beta01'
   );
 
-  assert.equal(previousTag, 'brownfield-gradle-plugin/v2.0.0-alpha04');
+  assert.equal(previousTag, 'brownfield-gradle-plugin/v2.0.0-alpha05');
 });
 
 test('treats a stable release as newer than its prereleases', () => {