From 0de15e2af7e5e63d45948e7cd246bf5e121c214f Mon Sep 17 00:00:00 2001 From: Vlad Gorlov Date: Sat, 2 Oct 2021 11:13:08 +0200 Subject: [PATCH 1/3] Readme update. --- Package/Sources/CAndroidJNI/Helpers.h | 2 +- Package/Sources/CAndroidLog/shim.h | 2 +- Readme.md | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Package/Sources/CAndroidJNI/Helpers.h b/Package/Sources/CAndroidJNI/Helpers.h index 580349b..e99dfa0 100644 --- a/Package/Sources/CAndroidJNI/Helpers.h +++ b/Package/Sources/CAndroidJNI/Helpers.h @@ -8,7 +8,7 @@ #ifndef File_h #define File_h -#include "/usr/local/ndk/21.3.6528147/sysroot/usr/include/jni.h" +#include "/usr/local/ndk/21.4.7075529/sysroot/usr/include/jni.h" typedef struct { const signed char * _Nonnull data; diff --git a/Package/Sources/CAndroidLog/shim.h b/Package/Sources/CAndroidLog/shim.h index 0fe0420..6ac0273 100644 --- a/Package/Sources/CAndroidLog/shim.h +++ b/Package/Sources/CAndroidLog/shim.h @@ -1,4 +1,4 @@ -#include "/usr/local/ndk/21.3.6528147/sysroot/usr/include/android/log.h" +#include "/usr/local/ndk/21.4.7075529/sysroot/usr/include/android/log.h" static inline int __android_log_print_1(const char *str) { return __android_log_print(ANDROID_LOG_INFO, "SwiftAndroid", "%s", str); diff --git a/Readme.md b/Readme.md index 28a5b94..0198eee 100644 --- a/Readme.md +++ b/Readme.md @@ -21,14 +21,16 @@ 4. Make sure that NDK version defined in Gradle build configuration file (See: `Android/app/build.gradle`) in property `android.ndkVersion` matches NDK version from file you viewed on step 2. Update property `android.ndkVersion` if needed. -5. Copy file `example.swiftToolchain.rc` to `swiftToolchain.rc`. Update file `swiftToolchain.rc` with proper paths: +5. Make sure that the absolute paths to NDK headers in sources matching NDK version inside file `NDK_VERSION`. + +6. Copy file `example.swiftToolchain.rc` to `swiftToolchain.rc`. Update file `swiftToolchain.rc` with proper paths: - `SaSwiftToolchainDirPath` - Path to Swift Toolchain you downloaded or built on step 1. -6. Install "Protocol buffers" for Java and Swift sources generation `brew install protobuf swift-protobuf` +7. Install "Protocol buffers" for Java and Swift sources generation `brew install protobuf swift-protobuf` -7. (Optional) Generate models: `Scripts/GenerateModels.sh` +8. (Optional) Generate models: `Scripts/GenerateModels.sh` -8. Open `iOS/HelloJNI.xcodeproj` in Xcode and run it on Device or iOS Simulator. +9. Open `iOS/HelloJNI.xcodeproj` in Xcode and run it on Device or iOS Simulator. -9. Open folder `Android` in Android Studio and run it on Device or Android Simulator. +10. Open folder `Android` in Android Studio and run it on Device or Android Simulator. From 95f812335957fe531bacd9a862919c9fe0ec9fde Mon Sep 17 00:00:00 2001 From: Vlad Gorlov Date: Sat, 2 Oct 2021 11:24:10 +0200 Subject: [PATCH 2/3] Removed .idea folder. --- Android/.gitignore | 8 +----- Android/.idea/codeStyles/codeStyleConfig.xml | 5 ---- Android/.idea/compiler.xml | 6 ---- Android/.idea/deploymentTargetDropDown.xml | 17 ----------- Android/.idea/encodings.xml | 4 --- Android/.idea/gradle.xml | 21 -------------- Android/.idea/jarRepositories.xml | 30 -------------------- Android/.idea/misc.xml | 14 --------- Android/.idea/vcs.xml | 6 ---- 9 files changed, 1 insertion(+), 110 deletions(-) mode change 100755 => 100644 Android/.gitignore delete mode 100644 Android/.idea/codeStyles/codeStyleConfig.xml delete mode 100644 Android/.idea/compiler.xml delete mode 100644 Android/.idea/deploymentTargetDropDown.xml delete mode 100644 Android/.idea/encodings.xml delete mode 100755 Android/.idea/gradle.xml delete mode 100644 Android/.idea/jarRepositories.xml delete mode 100755 Android/.idea/misc.xml delete mode 100755 Android/.idea/vcs.xml diff --git a/Android/.gitignore b/Android/.gitignore old mode 100755 new mode 100644 index 818cd98..cdc1151 --- a/Android/.gitignore +++ b/Android/.gitignore @@ -1,13 +1,7 @@ *.iml .gradle /local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -/.idea/codeStyles/Project.xml +/.idea .DS_Store /build /.build diff --git a/Android/.idea/codeStyles/codeStyleConfig.xml b/Android/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123..0000000 --- a/Android/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/Android/.idea/compiler.xml b/Android/.idea/compiler.xml deleted file mode 100644 index fb7f4a8..0000000 --- a/Android/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Android/.idea/deploymentTargetDropDown.xml b/Android/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index f30f131..0000000 --- a/Android/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Android/.idea/encodings.xml b/Android/.idea/encodings.xml deleted file mode 100644 index 15a15b2..0000000 --- a/Android/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Android/.idea/gradle.xml b/Android/.idea/gradle.xml deleted file mode 100755 index 35ffc65..0000000 --- a/Android/.idea/gradle.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Android/.idea/jarRepositories.xml b/Android/.idea/jarRepositories.xml deleted file mode 100644 index e34606c..0000000 --- a/Android/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Android/.idea/misc.xml b/Android/.idea/misc.xml deleted file mode 100755 index 70d034b..0000000 --- a/Android/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Android/.idea/vcs.xml b/Android/.idea/vcs.xml deleted file mode 100755 index 6c0b863..0000000 --- a/Android/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From aa5ee5148ead4aa920a2ac02d164e2cacc03f4a3 Mon Sep 17 00:00:00 2001 From: Vlad Gorlov Date: Sat, 2 Oct 2021 11:40:35 +0200 Subject: [PATCH 3/3] Version bump. --- CHANGELOG | 3 +++ VERSION | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index a2521f7..6b5ef5e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.0.16] - 2021-10-02 +* Fixes wrong path to NDK headers in sample sources. + ## [1.0.15] - 2021-09-17 * Gradle and Android Studio compatibility upgrade. diff --git a/VERSION b/VERSION index a970716..b668c3b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.15 +1.0.16