Merge pull request #9 from vgorloff/develop

RC 1.0.8
vgorloff · Mar 26, 2020 · 3b82f53 · 3b82f53
2 parents a6e3cc2 + 512c7b2
commit 3b82f53
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 17 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+   "cSpell.words": [
+      "Toolchain"
+   ]
+}
diff --git a/Android/.gitignore b/Android/.gitignore
@@ -7,6 +7,7 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/codeStyles/Project.xml
 .DS_Store
 /build
 /.build

diff --git a/Android/.idea/gradle.xml b/Android/.idea/gradle.xml
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -47,7 +47,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }

diff --git a/Android/build.gradle b/Android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.6.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun May 05 18:33:42 CEST 2019
+#Wed Mar 25 23:14:43 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,13 +4,17 @@ 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.8] - 2020-03-26
+### Changed
+* Gradle and dependencies update.
+
 ## [1.0.7] - 2019-08-19
 ### Changed
 * Updated compiler settings to fit recent changes in Swift.
 
 ## [1.0.6] - 2019-08-12
 ### Changed
-- Monolitic APK split on smaller per-architecture parts.
+- Monolithic APK split on smaller per-architecture parts.
 - Changed location of JNILibs.
 ### Added
 - Environment variables to allow Swift networking to function without errors.

diff --git a/Readme.md b/Readme.md
@@ -1,8 +1,8 @@
 # Requirements
 
-- Xcode 11
-- Android Studio 3.4
-- Android NDK 20 (Comes with Android Studio as downloadable package).
+- Xcode 11.4
+- Android Studio 3.4.1
+- Android NDK r20b (Comes with Android Studio as downloadable package). **Note**: NDK r21 cannot be used with libDispatch yet due compile errors addressed clang/libc++ update.
 - Ruby 2.5 (Comes with macOS)
 
 ## Usage
@@ -21,8 +21,3 @@
 4. Open `iOS/HelloJNI.xcodeproj` in Xcode 11 and run it on Device or iOS Simulator.
 
 5. Open folder `Android` in Android Studio and run it on Device or Android Simulator.
-
-## Links
-
-- Android NDK: Using C/C++ Native Libraries to Write Android Apps: http://bit.ly/2HjXYJk
-- Modern Android NDK Tutorial – Jordan Réjaud – Medium: http://bit.ly/2HvrmLO
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.7
+1.0.8