Skip to content

Commit 6161d79

Browse files
chrispaderchrispader
committed
Merge branch 'main' into nitro
2 parents cef2c9a + 4a4ed95 commit 6161d79

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1880
-1196
lines changed

‎.editorconfig‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# EditorConfig helps developers define and maintain consistent
2+
# coding styles between different editors and IDEs
3+
# editorconfig.org
4+
5+
root = true
6+
7+
[*]
8+
9+
indent_style = space
10+
indent_size = 2
11+
12+
end_of_line = lf
13+
charset = utf-8
14+
trim_trailing_whitespace = true
15+
insert_final_newline = true

‎.eslintrc.js‎

Lines changed: 0 additions & 108 deletions
This file was deleted.

‎.github/dependabot.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
version: 2
2+
3+
updates:
4+
- package-ecosystem: 'github-actions'
5+
directory: '/'
6+
schedule:
7+
interval: 'daily'
8+
labels:
9+
- 'dependencies'
10+
11+
- package-ecosystem: 'gradle'
12+
directories:
13+
- '/package/android/'
14+
- '/example/android/'
15+
schedule:
16+
interval: 'daily'
17+
labels:
18+
- 'dependencies'
19+
- 'kotlin'
20+
21+
- package-ecosystem: 'npm'
22+
directories:
23+
- '/package/'
24+
- '/example/'
25+
schedule:
26+
interval: 'daily'
27+
labels:
28+
- 'dependencies'
29+
- 'typescript'
30+
groups:
31+
rncli:
32+
patterns:
33+
- '@react-native-community/cli*'
34+
babel:
35+
patterns:
36+
- '@babel/*'
37+
rn:
38+
patterns:
39+
- '@react-native/*'

‎.github/workflows/build-android-release.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Build Android (Release)
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
build_release:
9+
name: Build Android Example App (release, new architecture)
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
- uses: oven-sh/setup-bun@v2
14+
15+
- name: Install npm dependencies (bun)
16+
run: bun install
17+
18+
- name: Setup JDK 17
19+
uses: actions/setup-java@v4
20+
with:
21+
distribution: "zulu"
22+
java-version: 17
23+
java-package: jdk
24+
25+
- name: Restore Gradle cache
26+
uses: actions/cache@v4
27+
with:
28+
path: |
29+
~/.gradle/caches
30+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
31+
restore-keys: |
32+
${{ runner.os }}-gradle-
33+
- name: Run Gradle Build for example/android/
34+
working-directory: example/android
35+
run: ./gradlew assembleRelease --no-daemon --build-cache
36+
37+
- name: Upload APK to Release
38+
uses: actions/upload-release-asset@v1
39+
env:
40+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
41+
with:
42+
upload_url: ${{ github.event.release.upload_url }}
43+
asset_path: example/android/app/build/outputs/apk/release/app-release.apk
44+
asset_name: "QuickSQLiteExample-${{ github.event.release.tag_name }}.apk"
45+
asset_content_type: application/vnd.android.package-archive
46+
47+
# Gradle cache doesn't like daemons
48+
- name: Stop Gradle Daemon
49+
working-directory: example/android
50+
run: ./gradlew --stop

‎.github/workflows/build-android.yml‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
name: Build Android
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- ".github/workflows/build-android.yml"
9+
- "example/android/**"
10+
- "**/nitrogen/generated/shared/**"
11+
- "**/nitrogen/generated/android/**"
12+
- "package/cpp/**"
13+
- "package/android/**"
14+
- "bun.lockb"
15+
- "**/react-native.config.js"
16+
- "**/nitro.json"
17+
pull_request:
18+
paths:
19+
- ".github/workflows/build-android.yml"
20+
- "example/android/**"
21+
- "**/nitrogen/generated/shared/**"
22+
- "**/nitrogen/generated/android/**"
23+
- "package/cpp/**"
24+
- "package/android/**"
25+
- "bun.lockb"
26+
- "**/react-native.config.js"
27+
- "**/nitro.json"
28+
29+
jobs:
30+
build_new:
31+
name: Build Android Example App (new architecture)
32+
runs-on: ubuntu-latest
33+
steps:
34+
- uses: actions/checkout@v4
35+
- uses: oven-sh/setup-bun@v2
36+
37+
- name: Install npm dependencies (bun)
38+
run: bun install
39+
40+
- name: Setup JDK 17
41+
uses: actions/setup-java@v4
42+
with:
43+
distribution: "zulu"
44+
java-version: 17
45+
java-package: jdk
46+
47+
- name: Restore Gradle cache
48+
uses: actions/cache@v4
49+
with:
50+
path: |
51+
~/.gradle/caches
52+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
53+
restore-keys: |
54+
${{ runner.os }}-gradle-
55+
- name: Run Gradle Build for example/android/
56+
working-directory: example/android
57+
run: ./gradlew assembleDebug --no-daemon --build-cache
58+
59+
# Gradle cache doesn't like daemons
60+
- name: Stop Gradle Daemon
61+
working-directory: example/android
62+
run: ./gradlew --stop
63+
64+
build_old:
65+
name: Build Android Example App (old architecture)
66+
runs-on: ubuntu-latest
67+
steps:
68+
- uses: actions/checkout@v4
69+
- uses: oven-sh/setup-bun@v2
70+
71+
- name: Install npm dependencies (bun)
72+
run: bun install
73+
74+
- name: Disable new architecture in gradle.properties
75+
run: sed -i "s/newArchEnabled=true/newArchEnabled=false/g" example/android/gradle.properties
76+
77+
- name: Setup JDK 17
78+
uses: actions/setup-java@v4
79+
with:
80+
distribution: "zulu"
81+
java-version: 17
82+
java-package: jdk
83+
84+
- name: Restore Gradle cache
85+
uses: actions/cache@v4
86+
with:
87+
path: |
88+
~/.gradle/caches
89+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
90+
restore-keys: |
91+
${{ runner.os }}-gradle-
92+
- name: Run Gradle Build for example/android/
93+
working-directory: example/android
94+
run: ./gradlew assembleDebug --no-daemon --build-cache
95+
96+
# Gradle cache doesn't like daemons
97+
- name: Stop Gradle Daemon
98+
working-directory: example/android
99+
run: ./gradlew --stop

0 commit comments

Comments
 (0)