Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/sample-application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,7 @@ jobs:
run: |
zip -j \
${{ env.ANDROID_APP_ARCHIVE_PATH }} \
${{ env.REACT_NATIVE_SAMPLE_PATH }}/app.apk \
${{ env.REACT_NATIVE_SAMPLE_PATH }}/app-androidTest.apk
${{ env.REACT_NATIVE_SAMPLE_PATH }}/app.apk

- name: Upload Android APK
if: ${{ matrix.rn-architecture == 'new' && matrix.build-type == 'production' }}
Expand Down Expand Up @@ -694,7 +693,6 @@ jobs:
working-directory: ${{ env.REACT_NATIVE_SAMPLE_PATH }}
run: |
unzip ${{ env.ANDROID_APP_ARCHIVE_PATH }}
rm app-androidTest.apk

- name: Enable Corepack (NPM)
run: npm i -g corepack
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
"@yarnpkg/parsers@npm:3.0.0-rc.46/js-yaml": "^3.15.2",
"cosmiconfig@npm:5.2.1/js-yaml": "^3.15.2",
"js-yaml": "^4.3.2",
"detox@npm:20.46.0/ajv": "^8.18.0",
"@expo/fingerprint@npm:0.6.1/minimatch": "^3.1.3",
"glob@npm:6.0.4/minimatch": "^3.1.3",
"glob@npm:7.1.6/minimatch": "^3.1.3",
Expand Down
74 changes: 0 additions & 74 deletions samples/react-native/.detoxrc.js

This file was deleted.

6 changes: 0 additions & 6 deletions samples/react-native/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,6 @@ android {
versionCode 116
versionName "8.36.0"
buildConfigField "boolean", "SENTRY_DISABLE_NATIVE_START", System.getenv('SENTRY_DISABLE_NATIVE_START') ?: String.valueOf(sentryDisableNativeStart)

testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}

signingConfigs {
Expand Down Expand Up @@ -190,14 +187,11 @@ android {
signingConfig signingConfigs.debug
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
testProguardFiles "proguard-rules.pro"
proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
}
}
}

dependencies {
androidTestImplementation('com.wix:detox:+')
implementation 'androidx.appcompat:appcompat:1.7.0'

// The version of react-native is set by the React Native Gradle Plugin
Expand Down
6 changes: 0 additions & 6 deletions samples/react-native/android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,3 @@

# Add any project specific keep options here:

# Detox Release tests were failing on missing kotlin.Result
# It should be covered by node_modules/detox/android/detox/proguard-rules-app.pro but it seems missing
-keep class kotlin.** { *; }

# Detox references bridge classes removed in RN 0.84
-dontwarn com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener

This file was deleted.

8 changes: 0 additions & 8 deletions samples/react-native/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,4 @@ buildscript {
}
}

allprojects {
repositories {
maven {
url("$rootDir/../node_modules/detox/Detox-android")
}
}
}

apply plugin: "com.facebook.react.rootproject"
1 change: 0 additions & 1 deletion samples/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
"@types/react-test-renderer": "^19.1.0",
"babel-jest": "^29.6.3",
"babel-plugin-module-resolver": "^5.0.0",
"detox": "^20.33.0",
"jest": "^29.6.3",
"patch-package": "^8.0.0",
"react-test-renderer": "19.3.0",
Expand Down
5 changes: 2 additions & 3 deletions samples/react-native/scripts/build-android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ thisFilePath=$(dirname "$0")

cd "${thisFilePath}/../android"

rm -rf ../app.apk ../app-androidTest.apk
rm -rf ../app.apk

if [[ "${RN_ARCHITECTURE}" == 'new' ]]; then
perl -i -pe's/newArchEnabled=false/newArchEnabled=true/g' gradle.properties
Expand All @@ -23,7 +23,6 @@ echo "Building $CONFIG"

assembleConfig=$(python3 -c "print(\"${CONFIG}\".capitalize())")

./gradlew ":app:assemble${assembleConfig}" app:assembleAndroidTest -DtestBuildType=$CONFIG "$@"
./gradlew ":app:assemble${assembleConfig}" "$@"

cp "app/build/outputs/apk/${CONFIG}/app-${CONFIG}.apk" ../app.apk
cp "app/build/outputs/apk/androidTest/${CONFIG}/app-${CONFIG}-androidTest.apk" ../app-androidTest.apk
Loading
Loading