@bravemobile/react-native-code-push 13.3.0 → 13.3.2

package/android/build.gradle

@@ -1,24 +1,58 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+apply plugin: "com.android.library"
+apply plugin: "com.facebook.react"
 
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
+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
+
+react {
+    jsRootDir = file("..")
+    libraryName = "RNCodePushSpec"
+    codegenJavaPackageName = "com.microsoft.codepush.react"
+}
+
+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"
     }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
 
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+    lintOptions {
+        abortOnError false
     }
-}
 
-allprojects {
-    android {
-        namespace "com.microsoft.codepush.react"
+    defaultConfig {
+        consumerProguardFiles 'proguard-rules.pro'
     }
-    repositories {
-        mavenLocal()
-        mavenCentral()
+
+    // Builds the binary patch applier. Its sources are the shared ones at the root of the
+    // repository, which the CMake file points at; nothing is compiled twice.
+    externalNativeBuild {
+        cmake {
+            path "src/main/cpp/CMakeLists.txt"
+        }
+    }
+
+    testOptions {
+        // The unit tests exercise plain logic, so the android framework classes they touch
+        // in passing (logging above all) are allowed to do nothing instead of throwing.
+        unitTests.returnDefaultValues = true
     }
 }
+
+dependencies {
+    implementation "com.facebook.react:react-native:+"
+
+    testImplementation "junit:junit:4.13.2"
+    // org.json ships as stubs in the android framework jar, and the unit tests parse real
+    // manifests, so they need an implementation that actually parses.
+    testImplementation "org.json:json:20231013"
+}

package/android/{app/src → src}/main/cpp/CMakeLists.txt

@@ -6,7 +6,7 @@ project(codepush-binarypatch C)
 # the other platform compile the very same files. Referencing them where they are is
 # what keeps the appliers of the platforms from drifting apart, so they are deliberately
 # not copied into this directory.
-set(BINARY_PATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../cpp/binarypatch)
+set(BINARY_PATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../cpp/binarypatch)
 
 add_library(codepush-binarypatch SHARED
         ${CMAKE_CURRENT_SOURCE_DIR}/binarypatch_jni.c
@@ -34,5 +34,9 @@ target_compile_definitions(codepush-binarypatch PRIVATE
         ZSTD_DISABLE_ASM=1
         _IS_USED_MULTITHREAD=0)
 
+target_link_options(codepush-binarypatch PRIVATE
+        "-Wl,-z,max-page-size=16384"
+        "-Wl,-z,common-page-size=16384")
+
 find_library(log-lib log)
 target_link_libraries(codepush-binarypatch ${log-lib})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "13.3.0",
+  "version": "13.3.2",
   "description": "React Native plugin for the CodePush service",
   "main": "src/CodePush.js",
   "react-native": "src/CodePush.js",
@@ -58,10 +58,6 @@
     "!ios/build",
     "!ios/CodePushTests",
     "!android/build",
-    "!android/app/build",
-    "!android/gradle",
-    "!android/gradlew",
-    "!android/gradlew.bat",
     "!android/local.properties",
     "!cpp/binarypatch/host",
     "!**/__tests__",

package/react-native.config.js

@@ -5,7 +5,7 @@ module.exports = {
                 packageImportPath: "import com.microsoft.codepush.react.CodePush;",
                 packageInstance:
                     "CodePush.getInstance(getApplicationContext(), BuildConfig.DEBUG)",
-                sourceDir: './android/app',
+                sourceDir: './android',
                 libraryName: 'RNCodePushSpec',
                 cmakeListsPath: 'build/generated/source/codegen/jni/CMakeLists.txt',
             }

package/android/app/build.gradle

@@ -1,58 +0,0 @@
-apply plugin: "com.android.library"
-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
-
-react {
-    jsRootDir = file("../..")
-    libraryName = "RNCodePushSpec"
-    codegenJavaPackageName = "com.microsoft.codepush.react"
-}
-
-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"
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    defaultConfig {
-        consumerProguardFiles 'proguard-rules.pro'
-    }
-
-    // Builds the binary patch applier. Its sources are the shared ones at the root of the
-    // repository, which the CMake file points at; nothing is compiled twice.
-    externalNativeBuild {
-        cmake {
-            path "src/main/cpp/CMakeLists.txt"
-        }
-    }
-
-    testOptions {
-        // The unit tests exercise plain logic, so the android framework classes they touch
-        // in passing (logging above all) are allowed to do nothing instead of throwing.
-        unitTests.returnDefaultValues = true
-    }
-}
-
-dependencies {
-    implementation "com.facebook.react:react-native:+"
-
-    testImplementation "junit:junit:4.13.2"
-    // org.json ships as stubs in the android framework jar, and the unit tests parse real
-    // manifests, so they need an implementation that actually parses.
-    testImplementation "org.json:json:20231013"
-}

package/android/gradle.properties

@@ -1,20 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-android.useDeprecatedNdk=true

package/android/settings.gradle

@@ -1 +0,0 @@
-include ':app'