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

Commit 573f9e1

Browse files
committed
closer, but still no android joy
1 parent 9a0b43a commit 573f9e1

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

.github/workflows/build-android.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ jobs:
4545

4646
- name: Setup Android SDK
4747
uses: android-actions/setup-android@v3
48+
with:
49+
accept-android-sdk-licenses: true
50+
log-accepted-android-sdk-licenses: false
51+
cmdline-tools-version: 9477386
4852

4953
- name: Bootstrap JS
5054
run: |

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ buildscript {
66

77
dependencies {
88
classpath "com.android.tools.build:gradle:7.2.1"
9+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25"
910
}
1011
}
1112

@@ -19,24 +20,23 @@ def isNewArchitectureEnabled() {
1920
}
2021

2122
apply plugin: "com.android.library"
22-
apply plugin: 'org.jetbrains.kotlin.android'
23-
apply from: '../nitrogen/generated/android/QuickCrypto+autolinking.gradle'
23+
apply plugin: "org.jetbrains.kotlin.android"
24+
apply from: "../nitrogen/generated/android/QuickCrypto+autolinking.gradle"
2425

2526
if (isNewArchitectureEnabled()) {
2627
apply plugin: "com.facebook.react"
2728
}
2829

2930
def getExtOrDefault(name) {
30-
return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["Nitro_" + name]
31+
return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["QuickCrypto_" + name]
3132
}
3233

3334
def getExtOrIntegerDefault(name) {
34-
return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["Nitro_" + name]).toInteger()
35+
return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["QuickCrypto_" + name]).toInteger()
3536
}
3637

3738
android {
3839
namespace "com.margelo.nitro.quickcrypto"
39-
4040
ndkVersion getExtOrDefault("ndkVersion")
4141
compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
4242

@@ -106,12 +106,6 @@ dependencies {
106106

107107
// Add a dependency on NitroModules
108108
implementation project(":react-native-nitro-modules")
109-
110-
// Add a dependency on React Native Screens
111-
implementation project(':react-native-screens')
112-
113-
// Add a dependency on React Native Vector Icons
114-
implementation project(':react-native-vector-icons')
115109
}
116110

117111
if (isNewArchitectureEnabled()) {
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
QuickCrypto_kotlinVersion=1.9.25
12
QuickCrypto_compileSdkVersion=34
23
QuickCrypto_targetSdkVersion=34
3-
QuickCrypto_ndkversion=21.4.7075529
44
QuickCrypto_minSdkVersion=29
5+
QuickCrypto_ndkversion=21.4.7075529
56

67
android.useAndroidX=true

0 commit comments

Comments
 (0)