Skip to content
This repository was archived by the owner on Nov 20, 2024. It is now read-only.

Commit 3755178

Browse files
committed
gha path fixes, more android build fun
1 parent d88b432 commit 3755178

File tree

13 files changed

+51
-339
lines changed

13 files changed

+51
-339
lines changed

.github/workflows/build-android.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,21 @@ on:
66
- main
77
paths:
88
- '.github/workflows/build-android.yml'
9-
- 'android/**'
9+
- 'packages/react-native-quick-crypto/android/**'
10+
- 'packages/react-native-quick-crypto/nitrogen/generated/android/**'
11+
- 'packages/react-native-quick-crypto/nitrogen/generated/shared/**'
1012
- 'example/android/**'
11-
- 'yarn.lock'
12-
- 'example/yarn.lock'
13+
- 'bun.lockb'
14+
- 'example/bun.lockb'
1315
pull_request:
1416
paths:
1517
- '.github/workflows/build-android.yml'
16-
- 'android/**'
18+
- 'packages/react-native-quick-crypto/android/**'
19+
- 'packages/react-native-quick-crypto/nitrogen/generated/android/**'
20+
- 'packages/react-native-quick-crypto/nitrogen/generated/shared/**'
1721
- 'example/android/**'
18-
- 'yarn.lock'
19-
- 'example/yarn.lock'
22+
- 'bun.lockb'
23+
- 'example/bun.lockb'
2024

2125
jobs:
2226
build_android_example:
@@ -29,8 +33,6 @@ jobs:
2933
run: |
3034
sudo rm -rf /usr/share/dotnet
3135
sudo rm -rf /opt/ghc
32-
sudo rm -rf "/usr/local/share/boost"
33-
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
3436
3537
- uses: oven-sh/setup-bun@v2
3638
with:
@@ -48,6 +50,8 @@ jobs:
4850
with:
4951
accept-android-sdk-licenses: true
5052
log-accepted-android-sdk-licenses: false
53+
# this cmdline tools version barked the least in GHA runners
54+
# hopefully we can remove it in the future
5155
cmdline-tools-version: 9477386
5256

5357
- name: Bootstrap JS
@@ -64,8 +68,5 @@ jobs:
6468
restore-keys: |
6569
${{ runner.os }}-gradle-
6670
67-
- name: Run Gradle Build for android/
68-
run: cd packages/react-native-quick-crypto/android && ./gradlew assembleDebug && cd ../..
69-
70-
- name: Run Gradle Build for example/android/
71+
- name: Run Gradle Build for example app
7172
run: cd example/android && ./gradlew assembleDebug --build-cache && cd ../..

.github/workflows/build-ios.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@ on:
66
- main
77
paths:
88
- '.github/workflows/build-ios.yml'
9-
- 'ios/**'
9+
- 'packages/react-native-quick-crypto/ios/**'
10+
- 'packages/react-native-quick-crypto/nitrogen/generated/ios/**'
11+
- 'packages/react-native-quick-crypto/nitrogen/generated/shared/**'
1012
- '*.podspec'
1113
- 'example/ios/**'
1214
pull_request:
1315
paths:
1416
- '.github/workflows/build-ios.yml'
15-
- 'ios/**'
17+
- 'packages/react-native-quick-crypto/ios/**'
18+
- 'packages/react-native-quick-crypto/nitrogen/generated/ios/**'
19+
- 'packages/react-native-quick-crypto/nitrogen/generated/shared/**'
1620
- '*.podspec'
1721
- 'example/ios/**'
1822

.github/workflows/validate-android.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ jobs:
3737
with:
3838
accept-android-sdk-licenses: true
3939
log-accepted-android-sdk-licenses: false
40+
# this cmdline tools version barked the least in GHA runners
41+
# hopefully we can remove it in the future
4042
cmdline-tools-version: 9477386
4143

4244
- name: Bootstrap JS

.github/workflows/validate-js.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,29 @@ on:
66
- main
77
paths:
88
- '.github/workflows/validate-js.yml'
9-
- 'src/**'
10-
- '*.json'
11-
- '*.js'
12-
- '*.lock'
9+
- 'bun.lockb'
10+
- 'packages/react-native-quick-crypto/src/**'
11+
- 'packages/react-native-quick-crypto/*.json'
12+
- 'packages/react-native-quick-crypto/*.*s'
13+
- 'packages/react-native-quick-crypto/bun.lockb'
1314
- 'example/src/**'
1415
- 'example/*.json'
15-
- 'example/*.js'
16-
- 'example/*.lock'
17-
- 'example/*.tsx'
16+
- 'example/*.*s'
17+
- 'example/*.*sx'
18+
- 'example/bun.lockb'
1819
pull_request:
1920
paths:
2021
- '.github/workflows/validate-js.yml'
21-
- 'src/**'
22-
- '*.json'
23-
- '*.js'
24-
- '*.lock'
22+
- 'bun.lockb'
23+
- 'packages/react-native-quick-crypto/src/**'
24+
- 'packages/react-native-quick-crypto/*.json'
25+
- 'packages/react-native-quick-crypto/*.*s'
26+
- 'packages/react-native-quick-crypto/bun.lockb'
2527
- 'example/src/**'
2628
- 'example/*.json'
27-
- 'example/*.js'
28-
- 'example/*.lock'
29-
- 'example/*.tsx'
29+
- 'example/*.*s'
30+
- 'example/*.*sx'
31+
- 'example/bun.lockb'
3032

3133
jobs:
3234
compile_js:

example/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
22
ext {
33
buildToolsVersion = "34.0.0"
4-
minSdkVersion = 28
4+
minSdkVersion = 23
55
compileSdkVersion = 34
66
targetSdkVersion = 34
77
ndkVersion = "26.1.10909125"
8-
kotlinVersion = "1.9.22"
8+
kotlinVersion = "1.9.25"
99
}
1010
repositories {
1111
google()

packages/react-native-quick-crypto/android/build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
buildscript {
2+
ext.kotlinVersion = '1.9.25'
3+
24
repositories {
35
google()
46
mavenCentral()
57
}
68

79
dependencies {
8-
classpath "com.android.tools.build:gradle:7.2.1"
9-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25"
10+
classpath "com.android.tools.build:gradle:8.2.2"
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
1012
}
1113
}
1214

@@ -99,7 +101,9 @@ repositories {
99101

100102

101103
dependencies {
102-
implementation "com.facebook.react:react-native"
104+
//noinspection GradleDynamicVersion
105+
implementation "com.facebook.react:react-native:+"
106+
103107
implementation project(":react-native-nitro-modules")
104108
implementation "com.android.ndk.thirdparty:openssl:1.1.1q-beta-1"
105109
}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
QuickCrypto_kotlinVersion=1.9.25
21
QuickCrypto_compileSdkVersion=34
32
QuickCrypto_targetSdkVersion=34
4-
QuickCrypto_minSdkVersion=29
5-
QuickCrypto_ndkversion=21.4.7075529
3+
QuickCrypto_minSdkVersion=23
4+
QuickCrypto_ndkVersion=21.4.7075529
65

76
android.useAndroidX=true
-57.3 KB
Binary file not shown.

packages/react-native-quick-crypto/android/gradle/wrapper/gradle-wrapper.properties

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

packages/react-native-quick-crypto/android/gradlew

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

0 commit comments

Comments
 (0)