Skip to content

Commit

Permalink
upgrade to RN 68.5
Browse files Browse the repository at this point in the history
  • Loading branch information
nsantacruz committed Dec 19, 2022
1 parent cfcdccd commit 7a4d624
Show file tree
Hide file tree
Showing 10 changed files with 523 additions and 583 deletions.
96 changes: 0 additions & 96 deletions Gemfile.lock

This file was deleted.

14 changes: 12 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
def VERSION_BUILD=6164
def VERSION_BUILD=6167
def VERSION_MAJOR=5
def VERSION_MINOR=14
def VERSION_PATCH=6
def VERSION_PATCH=7

apply plugin: "com.android.application"
import com.android.build.OutputFile
import org.apache.tools.ant.taskdefs.condition.Os

/**
* The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
Expand Down Expand Up @@ -149,6 +150,15 @@ android {
// Make sure this target name is the same you specify inside the
// src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
targets "readerapp_appmodules"
// Fix for windows limit on number of character in file paths and in command lines
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
arguments "NDK_APP_SHORT_COMMANDS=true"
}
}
}
if (!enableSeparateBuildPerCPUArchitecture) {
ndk {
abiFilters (*reactNativeArchitectures())
}
}
}
Expand Down
10 changes: 9 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.apache.tools.ant.taskdefs.condition.Os

// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
Expand Down Expand Up @@ -61,11 +63,17 @@ ext {
minSdkVersion = 21
compileSdkVersion = 31
targetSdkVersion = 31
ndkVersion = "21.4.7075529"
supportLibVersion = "31.0.0"
react = [
extraPackagerArgs: ['--sourcemap-output', file("app/build/generated/index.android.js.map")]
]
if (System.properties['os.arch'] == "aarch64") {
// For M1 Users we need to use the NDK 24 which added support for aarch64
ndkVersion = "24.0.8215888"
} else {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
}
dependencies {
}
Loading

0 comments on commit 7a4d624

Please sign in to comment.