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
104 changes: 0 additions & 104 deletions .azurepipelines/build-rn-code-push-1es.yml

This file was deleted.

94 changes: 0 additions & 94 deletions .azurepipelines/test-rn-code-push.yml

This file was deleted.

14 changes: 0 additions & 14 deletions .config/CredScanSuppressions.json

This file was deleted.

48 changes: 0 additions & 48 deletions android/app/build.gradle

This file was deleted.

53 changes: 45 additions & 8 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
repositories {
google()
Expand All @@ -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'
}
File renamed without changes.
1 change: 0 additions & 1 deletion android/settings.gradle

This file was deleted.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion react-native.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
android: {
packageInstance:
"CodePush.getInstance(getResources().getString(R.string.CodePushDeploymentKey), getApplicationContext(), BuildConfig.DEBUG)",
sourceDir: './android/app',
sourceDir: './android',
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/tools/linkToolsAndroid.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down