diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index e9b044a..afa5244 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -38,7 +38,7 @@ jobs: - name: Get device name id: device - run: node -e "console.log('AVD_NAME=' + require('./Example/testHotUpdate/detox.config.js').devices.emulator.device.avdName)" >> $GITHUB_OUTPUT + run: node -e "console.log('AVD_NAME=' + require('./Example/testHotUpdate/.detoxrc').devices.emulator.device.avdName)" >> $GITHUB_OUTPUT - name: Detox test uses: reactivecircus/android-emulator-runner@v2 diff --git a/Example/testHotUpdate/android/app/build.gradle b/Example/testHotUpdate/android/app/build.gradle index f7fbc35..8bf9ec2 100644 --- a/Example/testHotUpdate/android/app/build.gradle +++ b/Example/testHotUpdate/android/app/build.gradle @@ -1,4 +1,7 @@ -apply plugin: "com.android.application" +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} import com.android.build.OutputFile diff --git a/Example/testHotUpdate/android/build.gradle b/Example/testHotUpdate/android/build.gradle index 6755150..4bc8142 100644 --- a/Example/testHotUpdate/android/build.gradle +++ b/Example/testHotUpdate/android/build.gradle @@ -8,7 +8,7 @@ buildscript { minSdkVersion = 21 compileSdkVersion = 31 targetSdkVersion = 31 - kotlinVersion = '1.7.10' + kotlinVersion = '1.6.10' if (System.properties['os.arch'] == "aarch64") { // For M1 Users we need to use the NDK 24 which added support for aarch64 diff --git a/Example/testHotUpdate/android/gradle.properties b/Example/testHotUpdate/android/gradle.properties index fa4feae..ac336f3 100644 --- a/Example/testHotUpdate/android/gradle.properties +++ b/Example/testHotUpdate/android/gradle.properties @@ -37,4 +37,4 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 # your application. You should enable this flag either if you want # to write custom TurboModules/Fabric components OR use libraries that # are providing them. -newArchEnabled=false +newArchEnabled=true diff --git a/Example/testHotUpdate/package.json b/Example/testHotUpdate/package.json index 69ca94f..0e9930d 100644 --- a/Example/testHotUpdate/package.json +++ b/Example/testHotUpdate/package.json @@ -27,7 +27,8 @@ "metro-react-native-babel-preset": "^0.76.0", "prettier": "^2.8.4", "react-test-renderer": "18.2.0", - "ts-jest": "^29.0.5" + "ts-jest": "^29.0.5", + "pod-install": "^0.1.37" }, "jest": { "preset": "react-native" diff --git a/ios/pushy_build_time.txt b/ios/pushy_build_time.txt index 0ed85e1..9a6f94d 100644 --- a/ios/pushy_build_time.txt +++ b/ios/pushy_build_time.txt @@ -1 +1 @@ -1680410620 +1680412162 diff --git a/react-native-update.podspec b/react-native-update.podspec index 6b4d42e..7fbfedd 100644 --- a/react-native-update.podspec +++ b/react-native-update.podspec @@ -1,7 +1,7 @@ require 'json' package = JSON.parse(File.read(File.join(__dir__, 'package.json'))) -folly_version = '2021.07.22.00' +folly_version = '2021.06.28.00-v2' folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' Pod::Spec.new do |s| s.name = package['name']