Skip to content

Commit a7316f8

Browse files
authored
feat: bump example to latest (#423)
1 parent 15f52d1 commit a7316f8

File tree

20 files changed

+4909
-7983
lines changed

20 files changed

+4909
-7983
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -253,50 +253,3 @@ jobs:
253253
- name: Build example for iOS
254254
run: |
255255
yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
256-
257-
build-macos:
258-
runs-on: macos-15
259-
env:
260-
TURBO_CACHE_DIR: .turbo/macos
261-
steps:
262-
- name: Checkout
263-
uses: actions/checkout@v4
264-
265-
- name: Setup
266-
uses: ./.github/actions/setup
267-
268-
- name: Build package
269-
run: yarn build
270-
271-
- name: Install xcbeautify
272-
run: |
273-
brew install xcbeautify
274-
275-
- name: Cache turborepo for macOS
276-
uses: actions/cache@v4
277-
with:
278-
path: ${{ env.TURBO_CACHE_DIR }}
279-
key: ${{ runner.os }}-turborepo-macos-${{ hashFiles('yarn.lock') }}
280-
restore-keys: |
281-
${{ runner.os }}-turborepo-macos-
282-
283-
- name: Check turborepo cache for macOS
284-
run: |
285-
TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:macos --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:macos').cache.status")
286-
287-
if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
288-
echo "turbo_cache_hit=1" >> $GITHUB_ENV
289-
fi
290-
291-
- name: Install cocoapods and plugins
292-
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
293-
run: |
294-
gem install cocoapods-swift-modular-headers
295-
cd apps/example
296-
pod install --project-directory=macos
297-
env:
298-
NO_FLIPPER: 1
299-
300-
- name: Build example for macOS
301-
run: |
302-
yarn turbo run build:macos --cache-dir="${{ env.TURBO_CACHE_DIR }}"

apps/example/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
*.xcworkspace/
44
*.zip
55
.DS_Store
6+
.bundle/*
7+
!.bundle/config
68
.gradle/
79
.idea/
810
.vs/

apps/example/android/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ buildscript {
2424

2525
allprojects {
2626
repositories {
27-
maven {
28-
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
29-
url({
30-
def searchDir = rootDir.toPath()
31-
do {
32-
def p = searchDir.resolve("node_modules/react-native/android")
33-
if (p.toFile().exists()) {
34-
return p.toRealPath().toString()
27+
{
28+
def searchDir = rootDir.toPath()
29+
do {
30+
def p = searchDir.resolve("node_modules/react-native/android")
31+
if (p.toFile().exists()) {
32+
maven {
33+
url = p.toRealPath().toString()
3534
}
36-
} while (searchDir = searchDir.getParent())
37-
throw new GradleException("Could not find `react-native`");
38-
}())
39-
}
35+
break
36+
}
37+
} while (searchDir = searchDir.getParent())
38+
// As of 0.80, React Native is no longer installed from npm
39+
}()
4040
mavenCentral()
4141
google()
4242
}

apps/example/android/gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
2525
# https://developer.android.com/topic/libraries/support-library/androidx-rn
2626
android.useAndroidX=true
2727
# Automatically convert third-party libraries to use AndroidX
28-
android.enableJetifier=false
28+
#android.enableJetifier=true
2929
# Jetifier randomly fails on these libraries
30-
android.jetifier.ignorelist=hermes-android,react-android
30+
#android.jetifier.ignorelist=hermes-android,react-android
3131

3232
# Use this property to specify which architecture you want to build.
3333
# You can also override it from the CLI using
@@ -50,4 +50,4 @@ newArchEnabled=true
5050
#ANDROID_NDK_VERSION=26.1.10909125
5151

5252
# Version of Kotlin to build against.
53-
#KOTLIN_VERSION=1.8.22
53+
#KOTLIN_VERSION=1.8.22

apps/example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

apps/example/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pluginManagement {
66
}
77
}
88

9-
rootProject.name = "BottomTabsExample"
9+
rootProject.name = "ReactNativeBottomTabs"
1010

1111
apply(from: {
1212
def searchDir = rootDir.toPath()

apps/example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ workspace 'ReactNativeBottomTabsExample.xcworkspace'
1010

1111
apply_modular_headers_for_swift_dependencies()
1212

13-
use_test_app!
13+
use_test_app! :hermes_enabled => true, :fabric_enabled => true

0 commit comments

Comments
 (0)