From 19336b4c561752360d191c829f1e184425aedd7d Mon Sep 17 00:00:00 2001 From: Revopush Date: Thu, 11 Sep 2025 20:05:48 +0300 Subject: [PATCH] fix native modules collision --- .azurepipelines/build-rn-code-push-1es.yml | 104 ------------------ .azurepipelines/test-rn-code-push.yml | 94 ---------------- .config/CredScanSuppressions.json | 14 --- android/app/build.gradle | 48 -------- android/build.gradle | 53 +++++++-- android/{app => }/proguard-rules.pro | 0 android/settings.gradle | 1 - .../{app => }/src/debug/AndroidManifest.xml | 0 .../{app => }/src/main/AndroidManifest.xml | 0 .../microsoft/codepush/react/CodePush.java | 0 .../codepush/react/CodePushConstants.java | 0 .../codepush/react/CodePushDialog.java | 0 .../codepush/react/CodePushInstallMode.java | 0 .../CodePushInvalidPublicKeyException.java | 0 .../react/CodePushInvalidUpdateException.java | 0 .../react/CodePushMalformedDataException.java | 0 .../codepush/react/CodePushNativeModule.java | 0 .../CodePushNotInitializedException.java | 0 .../react/CodePushTelemetryManager.java | 0 .../react/CodePushUnknownException.java | 0 .../codepush/react/CodePushUpdateManager.java | 0 .../codepush/react/CodePushUpdateState.java | 0 .../codepush/react/CodePushUpdateUtils.java | 0 .../codepush/react/CodePushUtils.java | 0 .../codepush/react/DownloadProgress.java | 0 .../react/DownloadProgressCallback.java | 0 .../microsoft/codepush/react/FileUtils.java | 0 .../codepush/react/ReactHostHolder.java | 0 .../codepush/react/ReactInstanceHolder.java | 0 .../codepush/react/SettingsManager.java | 0 .../codepush/react/TLSSocketFactory.java | 0 package-lock.json | 4 +- package.json | 2 +- react-native.config.js | 2 +- scripts/tools/linkToolsAndroid.js | 2 +- 35 files changed, 50 insertions(+), 274 deletions(-) delete mode 100644 .azurepipelines/build-rn-code-push-1es.yml delete mode 100644 .azurepipelines/test-rn-code-push.yml delete mode 100644 .config/CredScanSuppressions.json delete mode 100644 android/app/build.gradle rename android/{app => }/proguard-rules.pro (100%) delete mode 100644 android/settings.gradle rename android/{app => }/src/debug/AndroidManifest.xml (100%) rename android/{app => }/src/main/AndroidManifest.xml (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePush.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushConstants.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushDialog.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushInstallMode.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushInvalidPublicKeyException.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushInvalidUpdateException.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushMalformedDataException.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushNotInitializedException.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushTelemetryManager.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushUnknownException.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushUpdateManager.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushUpdateState.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/CodePushUtils.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/DownloadProgress.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/DownloadProgressCallback.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/FileUtils.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/ReactHostHolder.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/ReactInstanceHolder.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/SettingsManager.java (100%) rename android/{app => }/src/main/java/com/microsoft/codepush/react/TLSSocketFactory.java (100%) diff --git a/.azurepipelines/build-rn-code-push-1es.yml b/.azurepipelines/build-rn-code-push-1es.yml deleted file mode 100644 index b9423bd2f..000000000 --- a/.azurepipelines/build-rn-code-push-1es.yml +++ /dev/null @@ -1,104 +0,0 @@ -trigger: -- master - -pr: -- master - -resources: - repositories: - - repository: 1ESPipelineTemplates - type: git - name: 1ESPipelineTemplates/1ESPipelineTemplates - ref: refs/tags/release -name: $(Build.SourceBranchName)_$(date:yyyyMMdd)$(rev:.r) - -extends: - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}: - template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates - ${{ else }}: - template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates - parameters: - pool: - name: 1ES-PT-CBL-Mariner-2.0-Gen2 - os: linux - customBuildTags: - - ES365AIMigrationTooling-BulkMigrated - sdl: - sourceAnalysisPool: 1ES-PT-Windows-2022 - credscan: - suppressionsFile: $(Build.SourcesDirectory)/.config/CredScanSuppressions.json - stages: - - stage: Stage - jobs: - - job: HostJob - templateContext: - outputs: - - output: pipelineArtifact - displayName: "Publish Artifact: artifacts" - path: '$(Build.ArtifactStagingDirectory)/npm' - artifactName: npm - - steps: - - task: NodeTool@0 - inputs: - versionSpec: '14.x' - displayName: 'Install Node.js' - - - script: | - npm pack - npm install -g react-native-code-push*.tgz - displayName: 'Package react-native-code-push' - workingDirectory: $(Build.SourcesDirectory) - - - task: DeleteFiles@1 - inputs: - contents: node_modules - displayName: 'Delete node_modules' - - - task: ArchiveFiles@2 - inputs: - rootFolderOrFile: '$(Build.SourcesDirectory)' - includeRootFolder: false - archiveType: 'tar' - archiveFile: '$(Build.ArtifactStagingDirectory)/npm/$(Build.BuildId).tgz' - replaceExistingArchive: true - verbose: true - displayName: 'Prepare npm artifact' - - - stage: APIScan - dependsOn: Stage - pool: - name: 1ES-PT-Windows-2022 - os: windows - variables: - "agent.source.skip": true - jobs: - - job: APIScan - steps: - - task: DownloadPipelineArtifact@2 - displayName: Download Build Artifacts for APIScan - inputs: - artifactName: npm - targetPath: '$(Agent.BuildDirectory)/npm' - - task: ExtractFiles@1 - inputs: - archiveFilePatterns: '$(Agent.BuildDirectory)/npm/*.tgz' - destinationFolder: '$(Agent.BuildDirectory)/npm_extracted' - - task: AzureKeyVault@2 - inputs: - azureSubscription: 'AC - Dev Infra & Build Pool' - KeyVaultName: 'mobile-center-sdk' - SecretsFilter: 'appcenter-sdk-managed-identity-clientid' - RunAsPreJob: false - - task: APIScan@2 - displayName: 'Run APIScan' - inputs: - softwareFolder: '$(Agent.BuildDirectory)\npm_extracted' - softwareName: 'react-native-code-push' - softwareVersionNum: '$(Build.BuildId)' - isLargeApp: false - toolVersion: 'Latest' - verbosityLevel: verbose - condition: and(succeeded(), ne(variables['DisableAPIScan'], 'true')) - env: - AzureServicesAuthConnectionString: 'runAs=App;AppId=$(appcenter-sdk-managed-identity-clientid)' \ No newline at end of file diff --git a/.azurepipelines/test-rn-code-push.yml b/.azurepipelines/test-rn-code-push.yml deleted file mode 100644 index baf19ed68..000000000 --- a/.azurepipelines/test-rn-code-push.yml +++ /dev/null @@ -1,94 +0,0 @@ -trigger: -- master - -pr: -- master - -variables: -- name: api-level - value: '27' - -pool: - vmImage: 'macOS-12' - -stages: -- stage: RunTests - displayName: 'Run Android & IOS tests' - jobs: - - job: TestAndroid - timeoutInMinutes: 120 - displayName: 'Test android' - steps: - - - script: | - adb devices - displayName: 'Start adb server' - - - script: | - $ANDROID_HOME/tools/bin/sdkmanager "system-images;android-$(api-level);google_apis;x86" - displayName: 'Download system image' - - - script: | - $ANDROID_HOME/tools/bin/avdmanager create avd --force --name TestEmulator --abi google_apis/x86 --package 'system-images;android-$(api-level);google_apis;x86' --device "Nexus 6P" - displayName: 'Creating Android emulator' - - - script: | - $ANDROID_HOME/emulator/emulator -avd TestEmulator -noaudio -no-window -no-snapshot-save -no-boot-anim -memory 6144 & - displayName: 'Start Android emulator' - - - script: | - $ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 1; done' - displayName: 'Wait for emulator to boot' - - - script: | - adb shell settings put global window_animation_scale 0.0 - displayName: 'Disable animations and transitions' - - - script: | - adb shell settings put global transition_animation_scale 0.0 - displayName: 'Disable animations and transitions' - - - script: | - adb shell settings put global animator_duration_scale 0.0 - displayName: 'Disable animations and transitions' - - - - task: JavaToolInstaller@0 - inputs: - versionSpec: '11' - jdkArchitectureOption: 'x64' - jdkSourceOption: 'PreInstalled' - displayName: 'Change Java version' - - - script: | - npm install - displayName: 'Package Installation' - - - script: | - npm run build:tests && npm run test:setup:android - displayName: 'Setup Android tests' - - - script: | - npm run test:fast:android - displayName: 'Run Android test' - - - job: TestIOS - timeoutInMinutes: 120 - displayName: 'Test IOS' - steps: - - - script: | - npm install - displayName: 'Install dependencies' - - - script: | - npm run build:tests && npm run test:setup:ios - displayName: 'Setup iOS tests' - - - script: | - npm run test:fast:ios - displayName: 'Run tests' - - - - diff --git a/.config/CredScanSuppressions.json b/.config/CredScanSuppressions.json deleted file mode 100644 index 521169fdd..000000000 --- a/.config/CredScanSuppressions.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "tool": "Credential Scanner", - "suppressions": [ - { - "file": "/Examples/CodePushDemoApp/android/app/debug.keystore", - "_justification": "Used only in DemoApp" - }, - { - "file": "/Examples/CodePushDemoAppCpp/windows/CodePushDemoAppCpp/CodePushDemoAppCpp_TemporaryKey.pfx", - "_justification": "Used only in DemoApp" - } - ] -} - \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle deleted file mode 100644 index 133dd3e36..000000000 --- a/android/app/build.gradle +++ /dev/null @@ -1,48 +0,0 @@ -apply plugin: "com.android.library" - -def isNewArchitectureEnabled() { - // To opt-in for the New Architecture, you can either: - // - Set `newArchEnabled` to true inside the `gradle.properties` file - // - Invoke gradle with `-newArchEnabled=true` - // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true` - return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true" -} - -def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled() - -if (IS_NEW_ARCHITECTURE_ENABLED) { - apply plugin: "com.facebook.react" -} - -def DEFAULT_COMPILE_SDK_VERSION = 26 -def DEFAULT_BUILD_TOOLS_VERSION = "26.0.3" -def DEFAULT_TARGET_SDK_VERSION = 26 -def DEFAULT_MIN_SDK_VERSION = 16 - -android { - namespace "com.microsoft.codepush.react" - - compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION - buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION - - defaultConfig { - minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION - targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION - versionCode 1 - versionName "1.0" - buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", IS_NEW_ARCHITECTURE_ENABLED.toString() - } - - lintOptions { - abortOnError false - } - - defaultConfig { - consumerProguardFiles 'proguard-rules.pro' - } -} - -dependencies { - implementation "com.facebook.react:react-native:+" - implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3' -} diff --git a/android/build.gradle b/android/build.gradle index 31a524838..513a1fd1e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,3 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { repositories { google() @@ -13,12 +11,51 @@ buildscript { } } -allprojects { - android { - namespace "com.microsoft.codepush.react" +apply plugin: "com.android.library" + +def isNewArchitectureEnabled() { + // To opt-in for the New Architecture, you can either: + // - Set `newArchEnabled` to true inside the `gradle.properties` file + // - Invoke gradle with `-newArchEnabled=true` + // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true` + return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true" +} + +def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled() + +if (IS_NEW_ARCHITECTURE_ENABLED) { + apply plugin: "com.facebook.react" +} + +def DEFAULT_COMPILE_SDK_VERSION = 26 +def DEFAULT_BUILD_TOOLS_VERSION = "26.0.3" +def DEFAULT_TARGET_SDK_VERSION = 26 +def DEFAULT_MIN_SDK_VERSION = 16 + +android { + namespace "com.microsoft.codepush.react" + + compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION + buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION + + defaultConfig { + minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION + targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION + versionCode 1 + versionName "1.0" + buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", IS_NEW_ARCHITECTURE_ENABLED.toString() } - repositories { - mavenLocal() - mavenCentral() + + lintOptions { + abortOnError false } + + defaultConfig { + consumerProguardFiles 'proguard-rules.pro' + } +} + +dependencies { + implementation "com.facebook.react:react-native:+" + implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3' } diff --git a/android/app/proguard-rules.pro b/android/proguard-rules.pro similarity index 100% rename from android/app/proguard-rules.pro rename to android/proguard-rules.pro diff --git a/android/settings.gradle b/android/settings.gradle deleted file mode 100644 index 9d495b34f..000000000 --- a/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' \ No newline at end of file diff --git a/android/app/src/debug/AndroidManifest.xml b/android/src/debug/AndroidManifest.xml similarity index 100% rename from android/app/src/debug/AndroidManifest.xml rename to android/src/debug/AndroidManifest.xml diff --git a/android/app/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml similarity index 100% rename from android/app/src/main/AndroidManifest.xml rename to android/src/main/AndroidManifest.xml diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java b/android/src/main/java/com/microsoft/codepush/react/CodePush.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePush.java rename to android/src/main/java/com/microsoft/codepush/react/CodePush.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushConstants.java b/android/src/main/java/com/microsoft/codepush/react/CodePushConstants.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushConstants.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushConstants.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushDialog.java b/android/src/main/java/com/microsoft/codepush/react/CodePushDialog.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushDialog.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushDialog.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushInstallMode.java b/android/src/main/java/com/microsoft/codepush/react/CodePushInstallMode.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushInstallMode.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushInstallMode.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushInvalidPublicKeyException.java b/android/src/main/java/com/microsoft/codepush/react/CodePushInvalidPublicKeyException.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushInvalidPublicKeyException.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushInvalidPublicKeyException.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushInvalidUpdateException.java b/android/src/main/java/com/microsoft/codepush/react/CodePushInvalidUpdateException.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushInvalidUpdateException.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushInvalidUpdateException.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushMalformedDataException.java b/android/src/main/java/com/microsoft/codepush/react/CodePushMalformedDataException.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushMalformedDataException.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushMalformedDataException.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java b/android/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushNotInitializedException.java b/android/src/main/java/com/microsoft/codepush/react/CodePushNotInitializedException.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushNotInitializedException.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushNotInitializedException.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushTelemetryManager.java b/android/src/main/java/com/microsoft/codepush/react/CodePushTelemetryManager.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushTelemetryManager.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushTelemetryManager.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushUnknownException.java b/android/src/main/java/com/microsoft/codepush/react/CodePushUnknownException.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushUnknownException.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushUnknownException.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateManager.java b/android/src/main/java/com/microsoft/codepush/react/CodePushUpdateManager.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateManager.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushUpdateManager.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateState.java b/android/src/main/java/com/microsoft/codepush/react/CodePushUpdateState.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateState.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushUpdateState.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java b/android/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushUtils.java b/android/src/main/java/com/microsoft/codepush/react/CodePushUtils.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushUtils.java rename to android/src/main/java/com/microsoft/codepush/react/CodePushUtils.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/DownloadProgress.java b/android/src/main/java/com/microsoft/codepush/react/DownloadProgress.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/DownloadProgress.java rename to android/src/main/java/com/microsoft/codepush/react/DownloadProgress.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/DownloadProgressCallback.java b/android/src/main/java/com/microsoft/codepush/react/DownloadProgressCallback.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/DownloadProgressCallback.java rename to android/src/main/java/com/microsoft/codepush/react/DownloadProgressCallback.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java b/android/src/main/java/com/microsoft/codepush/react/FileUtils.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java rename to android/src/main/java/com/microsoft/codepush/react/FileUtils.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/ReactHostHolder.java b/android/src/main/java/com/microsoft/codepush/react/ReactHostHolder.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/ReactHostHolder.java rename to android/src/main/java/com/microsoft/codepush/react/ReactHostHolder.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/ReactInstanceHolder.java b/android/src/main/java/com/microsoft/codepush/react/ReactInstanceHolder.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/ReactInstanceHolder.java rename to android/src/main/java/com/microsoft/codepush/react/ReactInstanceHolder.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/SettingsManager.java b/android/src/main/java/com/microsoft/codepush/react/SettingsManager.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/SettingsManager.java rename to android/src/main/java/com/microsoft/codepush/react/SettingsManager.java diff --git a/android/app/src/main/java/com/microsoft/codepush/react/TLSSocketFactory.java b/android/src/main/java/com/microsoft/codepush/react/TLSSocketFactory.java similarity index 100% rename from android/app/src/main/java/com/microsoft/codepush/react/TLSSocketFactory.java rename to android/src/main/java/com/microsoft/codepush/react/TLSSocketFactory.java diff --git a/package-lock.json b/package-lock.json index 60a901768..91a756269 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@revopush/react-native-code-push", - "version": "1.3.0", + "version": "1.4.0-rc1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@revopush/react-native-code-push", - "version": "1.3.0", + "version": "1.4.0-rc1", "license": "MIT", "dependencies": { "code-push": "4.2.3", diff --git a/package.json b/package.json index 828758904..61e1aa113 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@revopush/react-native-code-push", - "version": "1.3.0", + "version": "1.4.0-rc1", "description": "React Native plugin for the CodePush service", "main": "CodePush.js", "typings": "typings/react-native-code-push.d.ts", diff --git a/react-native.config.js b/react-native.config.js index 386fbf066..adadc6f8f 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -4,7 +4,7 @@ module.exports = { android: { packageInstance: "CodePush.getInstance(getResources().getString(R.string.CodePushDeploymentKey), getApplicationContext(), BuildConfig.DEBUG)", - sourceDir: './android/app', + sourceDir: './android', } } } diff --git a/scripts/tools/linkToolsAndroid.js b/scripts/tools/linkToolsAndroid.js index ff81ad5de..b88cedd51 100644 --- a/scripts/tools/linkToolsAndroid.js +++ b/scripts/tools/linkToolsAndroid.js @@ -29,7 +29,7 @@ exports.getStringsResourcesPath = function () { } exports.getBuildGradlePath = function () { - return path.join("android", "app", "build.gradle"); + return path.join("android", "build.gradle"); } exports.isJsBundleOverridden = function (codeContents) {