From 37ff14eb6c315de1f2be25b1da30badb667d0956 Mon Sep 17 00:00:00 2001 From: namarora Date: Mon, 19 May 2025 12:02:59 +0530 Subject: [PATCH 1/8] added play services upgrade --- packages/places/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/places/android/build.gradle b/packages/places/android/build.gradle index c0f35509..2e343402 100644 --- a/packages/places/android/build.gradle +++ b/packages/places/android/build.gradle @@ -44,5 +44,5 @@ dependencies { implementation 'com.facebook.react:react-native:+' implementation platform("com.adobe.marketing.mobile:sdk-bom:3.+") api "com.adobe.marketing.mobile:places" - implementation 'com.google.android.gms:play-services-location:16.0.0' + implementation 'com.google.android.gms:play-services-location:21.2.0' } From d4c5293d681d2cdc38b86d54cbdf4b723d6c7764 Mon Sep 17 00:00:00 2001 From: namarora Date: Mon, 19 May 2025 12:12:21 +0530 Subject: [PATCH 2/8] added expo prebuild command --- .circleci/config.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 972b1230..dd5facd3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,6 @@ orbs: jobs: unit-test: docker: - # Use Node.js 18.x for compatibility with the project dependencies - image: cimg/node:18.20 steps: @@ -26,6 +25,10 @@ jobs: name: Build the Project command: yarn run build + - run: + name: Expo Prebuild + command: cd apps/AEPSampleAppNewArchEnabled && npx expo prebuild + - save_cache: key: yarn-cache-{{ checksum "yarn.lock" }} paths: @@ -53,16 +56,19 @@ jobs: name: Build the Project command: yarn run build + - run: + name: Expo Prebuild + command: cd apps/AEPSampleAppNewArchEnabled && npx expo prebuild + - run: name: Building Android Sample App command: yarn sampleappnewarchenabled:android:build - environment: _JAVA_OPTIONS: "-Xmx4096M -XX:MaxMetaspaceSize=512m" build-sample-app-ios: macos: - xcode: 15.2 # Specify the Xcode version to use + xcode: 15.2 steps: - checkout @@ -83,6 +89,10 @@ jobs: name: Build the Project command: yarn run build + - run: + name: Expo Prebuild + command: cd apps/AEPSampleAppNewArchEnabled && npx expo prebuild + - save_cache: key: ios-yarn-cache-{{ checksum "yarn.lock" }} paths: From 8f1e2b8ee034ef31c6acfb6c31c3ade50cefc3fc Mon Sep 17 00:00:00 2001 From: namarora Date: Mon, 19 May 2025 12:27:43 +0530 Subject: [PATCH 3/8] Android build fixes --- .circleci/config.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dd5facd3..ba9b390c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,3 @@ -# Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference version: 2.1 orbs: @@ -32,8 +31,8 @@ jobs: - save_cache: key: yarn-cache-{{ checksum "yarn.lock" }} paths: - - ./node_modules - - ./apps/AEPSampleAppNewArchEnabled/node_modules + - node_modules + - apps/AEPSampleAppNewArchEnabled/node_modules - run: name: Unit Tests @@ -61,8 +60,10 @@ jobs: command: cd apps/AEPSampleAppNewArchEnabled && npx expo prebuild - run: - name: Building Android Sample App - command: yarn sampleappnewarchenabled:android:build + name: Assemble Android Release Build + command: | + cd apps/AEPSampleAppNewArchEnabled/android + ./gradlew assembleRelease environment: _JAVA_OPTIONS: "-Xmx4096M -XX:MaxMetaspaceSize=512m" @@ -96,8 +97,8 @@ jobs: - save_cache: key: ios-yarn-cache-{{ checksum "yarn.lock" }} paths: - - ./node_modules - - ./apps/AEPSampleAppNewArchEnabled/node_modules + - node_modules + - apps/AEPSampleAppNewArchEnabled/node_modules - run: name: Install Cocoapods @@ -124,7 +125,7 @@ workflows: jobs: - unit-test - build-sample-app-ios - # - build-sample-app-android + - build-sample-app-android # Disable the Android build job because of the error below: # Execution failed for task ':react-native-reanimated:configureCMakeDebug[arm64-v8a]'. # > [CXX1210] /root/project/apps/AEPSampleApp/node_modules/react-native-reanimated/android/CMakeLists.txt debug|arm64-v8a : No compatible library found From 10c83e6a2375cd40eed9fa9aaeb3bbc3ed86d4a0 Mon Sep 17 00:00:00 2001 From: namarora Date: Mon, 19 May 2025 12:48:11 +0530 Subject: [PATCH 4/8] unset variable --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ba9b390c..dfcd4a46 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,9 +63,9 @@ jobs: name: Assemble Android Release Build command: | cd apps/AEPSampleAppNewArchEnabled/android + unset _JAVA_OPTIONS ./gradlew assembleRelease - environment: - _JAVA_OPTIONS: "-Xmx4096M -XX:MaxMetaspaceSize=512m" + build-sample-app-ios: macos: From 856ae1eb92f4014caaf3bd2c9db6f3d78e200ed2 Mon Sep 17 00:00:00 2001 From: namarora Date: Mon, 19 May 2025 14:32:05 +0530 Subject: [PATCH 5/8] added env --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dfcd4a46..ba9b390c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,9 +63,9 @@ jobs: name: Assemble Android Release Build command: | cd apps/AEPSampleAppNewArchEnabled/android - unset _JAVA_OPTIONS ./gradlew assembleRelease - + environment: + _JAVA_OPTIONS: "-Xmx4096M -XX:MaxMetaspaceSize=512m" build-sample-app-ios: macos: From 41279087f5b4ad05793225f89fd8d8e0b3a0a5a9 Mon Sep 17 00:00:00 2001 From: namarora Date: Mon, 19 May 2025 20:59:24 +0530 Subject: [PATCH 6/8] cmake issue solved --- .circleci/config.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ba9b390c..722e76b1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,6 +59,17 @@ jobs: name: Expo Prebuild command: cd apps/AEPSampleAppNewArchEnabled && npx expo prebuild + - run: + name: Install CMake 3.31.1 + command: | + cd /tmp + wget https://github.com/Kitware/CMake/releases/download/v3.31.1/cmake-3.31.1-linux-x86_64.sh + chmod +x cmake-3.31.1-linux-x86_64.sh + ./cmake-3.31.1-linux-x86_64.sh --skip-license --prefix=/opt/cmake + echo 'export PATH=/opt/cmake/bin:$PATH' >> $BASH_ENV + echo 'export CMAKE_VERSION=3.31.1' >> $BASH_ENV + source $BASH_ENV + - run: name: Assemble Android Release Build command: | @@ -126,7 +137,5 @@ workflows: - unit-test - build-sample-app-ios - build-sample-app-android - # Disable the Android build job because of the error below: - # Execution failed for task ':react-native-reanimated:configureCMakeDebug[arm64-v8a]'. - # > [CXX1210] /root/project/apps/AEPSampleApp/node_modules/react-native-reanimated/android/CMakeLists.txt debug|arm64-v8a : No compatible library found - # The Android build job will be enabled once the issue is resolved. + # Uncomment below once CMake/NDK compatibility issue is fully resolved + # - build-sample-app-android From 250353cbd5d7b813bc0b4b3db85abfd9fdecded8 Mon Sep 17 00:00:00 2001 From: namarora Date: Mon, 19 May 2025 21:01:03 +0530 Subject: [PATCH 7/8] removed ios build step --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 722e76b1..ec804fef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -135,7 +135,7 @@ workflows: ci-workflow: jobs: - unit-test - - build-sample-app-ios + # - build-sample-app-ios - build-sample-app-android # Uncomment below once CMake/NDK compatibility issue is fully resolved # - build-sample-app-android From 41288b4678fe78a6c4c58357c910ac2e0f15af10 Mon Sep 17 00:00:00 2001 From: namarora Date: Mon, 19 May 2025 21:06:13 +0530 Subject: [PATCH 8/8] added curl instead on wget --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ec804fef..01123740 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,7 +63,7 @@ jobs: name: Install CMake 3.31.1 command: | cd /tmp - wget https://github.com/Kitware/CMake/releases/download/v3.31.1/cmake-3.31.1-linux-x86_64.sh + curl -LO https://github.com/Kitware/CMake/releases/download/v3.31.1/cmake-3.31.1-linux-x86_64.sh chmod +x cmake-3.31.1-linux-x86_64.sh ./cmake-3.31.1-linux-x86_64.sh --skip-license --prefix=/opt/cmake echo 'export PATH=/opt/cmake/bin:$PATH' >> $BASH_ENV