diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index e6da25a1..2f31ba2a 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -6,17 +6,21 @@ on: - main paths: - '.github/workflows/build-android.yml' - - 'android/**' + - 'packages/react-native-quick-crypto/android/**' + - 'packages/react-native-quick-crypto/nitrogen/generated/android/**' + - 'packages/react-native-quick-crypto/nitrogen/generated/shared/**' - 'example/android/**' - - 'yarn.lock' - - 'example/yarn.lock' + - 'bun.lockb' + - 'example/bun.lockb' pull_request: paths: - '.github/workflows/build-android.yml' - - 'android/**' + - 'packages/react-native-quick-crypto/android/**' + - 'packages/react-native-quick-crypto/nitrogen/generated/android/**' + - 'packages/react-native-quick-crypto/nitrogen/generated/shared/**' - 'example/android/**' - - 'yarn.lock' - - 'example/yarn.lock' + - 'bun.lockb' + - 'example/bun.lockb' jobs: build_android_example: @@ -29,8 +33,6 @@ jobs: run: | sudo rm -rf /usr/share/dotnet sudo rm -rf /opt/ghc - sudo rm -rf "/usr/local/share/boost" - sudo rm -rf "$AGENT_TOOLSDIRECTORY" - uses: oven-sh/setup-bun@v2 with: @@ -48,6 +50,8 @@ jobs: with: accept-android-sdk-licenses: true log-accepted-android-sdk-licenses: false + # this cmdline tools version barked the least in GHA runners + # hopefully we can remove it in the future cmdline-tools-version: 9477386 - name: Bootstrap JS @@ -64,8 +68,5 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - - name: Run Gradle Build for android/ - run: cd packages/react-native-quick-crypto/android && ./gradlew assembleDebug && cd ../.. - - - name: Run Gradle Build for example/android/ + - name: Run Gradle Build for example app run: cd example/android && ./gradlew assembleDebug --build-cache && cd ../.. diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 6ba91a0d..3fa50825 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -6,13 +6,17 @@ on: - main paths: - '.github/workflows/build-ios.yml' - - 'ios/**' + - 'packages/react-native-quick-crypto/ios/**' + - 'packages/react-native-quick-crypto/nitrogen/generated/ios/**' + - 'packages/react-native-quick-crypto/nitrogen/generated/shared/**' - '*.podspec' - 'example/ios/**' pull_request: paths: - '.github/workflows/build-ios.yml' - - 'ios/**' + - 'packages/react-native-quick-crypto/ios/**' + - 'packages/react-native-quick-crypto/nitrogen/generated/ios/**' + - 'packages/react-native-quick-crypto/nitrogen/generated/shared/**' - '*.podspec' - 'example/ios/**' diff --git a/.github/workflows/validate-android.yml b/.github/workflows/validate-android.yml index 1eaa3851..b2fb4014 100644 --- a/.github/workflows/validate-android.yml +++ b/.github/workflows/validate-android.yml @@ -37,6 +37,8 @@ jobs: with: accept-android-sdk-licenses: true log-accepted-android-sdk-licenses: false + # this cmdline tools version barked the least in GHA runners + # hopefully we can remove it in the future cmdline-tools-version: 9477386 - name: Bootstrap JS diff --git a/.github/workflows/validate-js.yml b/.github/workflows/validate-js.yml index d3108fe0..ec5c3844 100644 --- a/.github/workflows/validate-js.yml +++ b/.github/workflows/validate-js.yml @@ -6,27 +6,29 @@ on: - main paths: - '.github/workflows/validate-js.yml' - - 'src/**' - - '*.json' - - '*.js' - - '*.lock' + - 'bun.lockb' + - 'packages/react-native-quick-crypto/src/**' + - 'packages/react-native-quick-crypto/*.json' + - 'packages/react-native-quick-crypto/*.*s' + - 'packages/react-native-quick-crypto/bun.lockb' - 'example/src/**' - 'example/*.json' - - 'example/*.js' - - 'example/*.lock' - - 'example/*.tsx' + - 'example/*.*s' + - 'example/*.*sx' + - 'example/bun.lockb' pull_request: paths: - '.github/workflows/validate-js.yml' - - 'src/**' - - '*.json' - - '*.js' - - '*.lock' + - 'bun.lockb' + - 'packages/react-native-quick-crypto/src/**' + - 'packages/react-native-quick-crypto/*.json' + - 'packages/react-native-quick-crypto/*.*s' + - 'packages/react-native-quick-crypto/bun.lockb' - 'example/src/**' - 'example/*.json' - - 'example/*.js' - - 'example/*.lock' - - 'example/*.tsx' + - 'example/*.*s' + - 'example/*.*sx' + - 'example/bun.lockb' jobs: compile_js: diff --git a/example/android/build.gradle b/example/android/build.gradle index 7d141754..04706112 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { ext { buildToolsVersion = "34.0.0" - minSdkVersion = 28 + minSdkVersion = 23 compileSdkVersion = 34 targetSdkVersion = 34 ndkVersion = "26.1.10909125" - kotlinVersion = "1.9.22" + kotlinVersion = "1.9.25" } repositories { google() diff --git a/packages/react-native-quick-crypto/android/build.gradle b/packages/react-native-quick-crypto/android/build.gradle index 6e511dc7..8465e7a2 100644 --- a/packages/react-native-quick-crypto/android/build.gradle +++ b/packages/react-native-quick-crypto/android/build.gradle @@ -1,12 +1,14 @@ buildscript { + ext.kotlinVersion = '1.9.25' + repositories { google() mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:7.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25" + classpath "com.android.tools.build:gradle:8.2.2" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" } } @@ -99,7 +101,9 @@ repositories { dependencies { - implementation "com.facebook.react:react-native" + //noinspection GradleDynamicVersion + implementation "com.facebook.react:react-native:+" + implementation project(":react-native-nitro-modules") implementation "com.android.ndk.thirdparty:openssl:1.1.1q-beta-1" } diff --git a/packages/react-native-quick-crypto/android/gradle.properties b/packages/react-native-quick-crypto/android/gradle.properties index 95479c71..e4ed6a1a 100644 --- a/packages/react-native-quick-crypto/android/gradle.properties +++ b/packages/react-native-quick-crypto/android/gradle.properties @@ -1,7 +1,6 @@ -QuickCrypto_kotlinVersion=1.9.25 QuickCrypto_compileSdkVersion=34 QuickCrypto_targetSdkVersion=34 -QuickCrypto_minSdkVersion=29 -QuickCrypto_ndkversion=21.4.7075529 +QuickCrypto_minSdkVersion=23 +QuickCrypto_ndkVersion=21.4.7075529 android.useAndroidX=true diff --git a/packages/react-native-quick-crypto/android/gradle/wrapper/gradle-wrapper.jar b/packages/react-native-quick-crypto/android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index f3d88b1c..00000000 Binary files a/packages/react-native-quick-crypto/android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/packages/react-native-quick-crypto/android/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-quick-crypto/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e411586a..00000000 --- a/packages/react-native-quick-crypto/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/packages/react-native-quick-crypto/android/gradlew b/packages/react-native-quick-crypto/android/gradlew deleted file mode 100755 index 2fe81a7d..00000000 --- a/packages/react-native-quick-crypto/android/gradlew +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/packages/react-native-quick-crypto/android/gradlew.bat b/packages/react-native-quick-crypto/android/gradlew.bat deleted file mode 100644 index 9618d8d9..00000000 --- a/packages/react-native-quick-crypto/android/gradlew.bat +++ /dev/null @@ -1,100 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/packages/react-native-quick-crypto/android/settings.gradle b/packages/react-native-quick-crypto/android/settings.gradle new file mode 100644 index 00000000..399b337b --- /dev/null +++ b/packages/react-native-quick-crypto/android/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'QuickCrypto' +include ':react-native-nitro-modules' +project(':react-native-nitro-modules').projectDir = file('../../../node_modules/react-native-nitro-modules/android') diff --git a/packages/react-native-quick-crypto/yalc.lock b/packages/react-native-quick-crypto/yalc.lock deleted file mode 100644 index 417541ff..00000000 --- a/packages/react-native-quick-crypto/yalc.lock +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": "v1", - "packages": { - "react-native-nitro-modules": { - "signature": "f69b53be06809c7cdefbd90588d2244a", - "file": true, - "replaced": "workspace:*" - }, - "nitro-codegen": { - "signature": "114966d35cb0c3413bc7390f946068c5", - "file": true, - "replaced": "workspace:*" - } - } -} \ No newline at end of file