Merge pull request #17 from vgorloff/develop

RC 1.0.16
vgorloff · Oct 2, 2021 · eb4ebc4 · eb4ebc4
2 parents 9ed07f0 + aa5ee51
commit eb4ebc4
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 118 deletions.
diff --git 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
diff --git a/Android/.idea/compiler.xml b/Android/.idea/compiler.xml
diff --git a/Android/.idea/deploymentTargetDropDown.xml b/Android/.idea/deploymentTargetDropDown.xml
diff --git a/Android/.idea/encodings.xml b/Android/.idea/encodings.xml
diff --git a/Android/.idea/gradle.xml b/Android/.idea/gradle.xml
diff --git a/Android/.idea/jarRepositories.xml b/Android/.idea/jarRepositories.xml
diff --git a/Android/.idea/misc.xml b/Android/.idea/misc.xml
diff --git a/Android/.idea/vcs.xml b/Android/.idea/vcs.xml
diff --git 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/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
@@ -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
@@ -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.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.15
+1.0.16