diff --git a/.circleci/config.yml b/.circleci/config.yml index 7784e1c83..0e3cb33a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,7 +73,7 @@ jobs: command: yarn - android/run-tests: working-directory: ./example/android - test-command: ./gradlew test + test-command: ./gradlew test -PinstabugUploadEnable=false validate_shell_files: machine: @@ -110,6 +110,7 @@ jobs: working_directory: ~/project/example environment: FL_OUTPUT_DIR: output + INSTABUG_SOURCEMAPS_UPLOAD_DISABLE: true steps: - checkout: path: ~/project @@ -154,6 +155,7 @@ jobs: working_directory: ~/project environment: FL_OUTPUT_DIR: output + INSTABUG_SOURCEMAPS_UPLOAD_DISABLE: true steps: - checkout - run: diff --git a/android/build.gradle b/android/build.gradle index 510effb27..fc3eee7b7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -53,8 +53,11 @@ task upload_sourcemap(type: Exec) { } tasks.whenTaskAdded { task -> - if (task.name == 'preReleaseBuild' && - (rootProject.hasProperty("instabugUploadEnable") ? rootProject.instabugUploadEnable : true)) { + def isEnabled = rootProject.hasProperty('instabugUploadEnable') + ? new Boolean(rootProject.property('instabugUploadEnable')) + : true + + if (task.name == 'preReleaseBuild' && isEnabled) { task.dependsOn upload_sourcemap } } diff --git a/example/.detoxrc.json b/example/.detoxrc.json index 7461e99a3..7357f9794 100644 --- a/example/.detoxrc.json +++ b/example/.detoxrc.json @@ -22,7 +22,7 @@ }, "android.emu.release": { "binaryPath": "android/app/build/outputs/apk/release/app-release.apk", - "build": "cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release && cd ..", + "build": "cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release -PinstabugUploadEnable=false && cd ..", "type": "android.emulator", "name": "Nexus_6P_API_27" }