Skip to content

Commit 09f0c28

Browse files
authored
feat: 0.68.1 update (#266)
1 parent bf8a2bb commit 09f0c28

File tree

4 files changed

+29
-4
lines changed

4 files changed

+29
-4
lines changed

template/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ GEM
4545
public_suffix (~> 4.0)
4646
typhoeus (~> 1.0)
4747
cocoapods-deintegrate (1.0.5)
48-
cocoapods-downloader (1.6.2)
48+
cocoapods-downloader (1.6.3)
4949
cocoapods-plugins (1.0.0)
5050
nap
5151
cocoapods-search (1.0.1)
@@ -71,7 +71,7 @@ GEM
7171
nanaimo (0.3.0)
7272
nap (1.1.0)
7373
netrc (0.11.0)
74-
public_suffix (4.0.6)
74+
public_suffix (4.0.7)
7575
rexml (3.2.5)
7676
ruby-macho (2.5.1)
7777
typhoeus (1.4.0)

template/android/app/build.gradle

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apply plugin: "com.android.application"
22

33
import com.android.build.OutputFile
4+
import org.apache.tools.ant.taskdefs.condition.Os
45

56
/**
67
* The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
@@ -157,6 +158,17 @@ android {
157158
// Make sure this target name is the same you specify inside the
158159
// src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
159160
targets "helloworld_appmodules"
161+
162+
// Fix for windows limit on number of character in file paths and in command lines
163+
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
164+
arguments "NDK_OUT=${rootProject.projectDir.getParent()}\\.cxx",
165+
"NDK_APP_SHORT_COMMANDS=true"
166+
}
167+
}
168+
}
169+
if (!enableSeparateBuildPerCPUArchitecture) {
170+
ndk {
171+
abiFilters (*reactNativeArchitectures())
160172
}
161173
}
162174
}

template/android/build.gradle

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.apache.tools.ant.taskdefs.condition.Os
2+
13
// Top-level build file where you can add configuration options common to all sub-projects/modules.
24

35
buildscript {
@@ -6,7 +8,18 @@ buildscript {
68
minSdkVersion = 21
79
compileSdkVersion = 31
810
targetSdkVersion = 31
9-
ndkVersion = "21.4.7075529"
11+
12+
if (System.properties['os.arch'] == "aarch64") {
13+
// For M1 Users we need to use the NDK 24 which added support for aarch64
14+
ndkVersion = "24.0.8215888"
15+
} else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
16+
// For Android Users, we need to use NDK 23, otherwise the build will
17+
// fail due to paths longer than the OS limit
18+
ndkVersion = "23.1.7779620"
19+
} else {
20+
// Otherwise we default to the side-by-side NDK version from AGP.
21+
ndkVersion = "21.4.7075529"
22+
}
1023
}
1124
repositories {
1225
google()

template/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"dependencies": {
1313
"react": "17.0.2",
14-
"react-native": "0.68.0"
14+
"react-native": "0.68.1"
1515
},
1616
"devDependencies": {
1717
"@babel/core": "^7.12.9",

0 commit comments

Comments
 (0)