diff --git a/CHANGELOG.md b/CHANGELOG.md
index d969360..1e574c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 1.7.0
+- AND: Updated to FreKotlin 1.42.0
+- iOS: Updated to FreSwift 5.1.0
+- Upgraded to AIR 33.1.1.345
+
### 1.6.0
- AND: Updated to FreKotlin 1.41.0
- iOS: Updated to FreSwift 5.0.0
diff --git a/README.md b/README.md
index 3750cdc..8327a4a 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ You will need:
- IntelliJ IDEA
- AIR 33.1.1.217+
-- Xcode 12.1
+- Xcode 12.3
- [.Net Core Runtime](https://dotnet.microsoft.com/download/dotnet-core/3.1)
- [AIR-Tools](https://github.com/tuarua/AIR-Tools/)
diff --git a/example/.idea/misc.xml b/example/.idea/misc.xml
index 45c69ec..854a1d3 100644
--- a/example/.idea/misc.xml
+++ b/example/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/example/.idea/runConfigurations/iOS_Simulator.xml b/example/.idea/runConfigurations/iOS_Simulator.xml
index fa7cae9..03decd7 100644
--- a/example/.idea/runConfigurations/iOS_Simulator.xml
+++ b/example/.idea/runConfigurations/iOS_Simulator.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/example/VibrationANESample.iml b/example/VibrationANESample.iml
index 28525f3..e285aff 100644
--- a/example/VibrationANESample.iml
+++ b/example/VibrationANESample.iml
@@ -12,7 +12,7 @@
-
+
@@ -72,7 +72,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
@@ -99,14 +99,14 @@
-
+
-
+
\ No newline at end of file
diff --git a/example/air_package.json b/example/air_package.json
index 850796e..9eae89d 100644
--- a/example/air_package.json
+++ b/example/air_package.json
@@ -1,6 +1,6 @@
{
"name": "vibration-sample",
- "version": "1.6.0",
+ "version": "1.7.0",
"appDescriptor": "src/Main-app.xml",
"variables": {
},
@@ -10,6 +10,6 @@
"url": "https://tuarua.github.io/air/air_packages.json"
},
"dependencies": {
- "com.tuarua.VibrationANE": "1.6.0"
+ "com.tuarua.VibrationANE": "1.7.0"
}
}
diff --git a/example/src/Main-app.xml b/example/src/Main-app.xml
index 596831c..ec3a48b 100644
--- a/example/src/Main-app.xml
+++ b/example/src/Main-app.xml
@@ -4,7 +4,7 @@
com.tuarua.vibrationanesample
VibrationANESample
VibrationANESample
- 1.6.0
+ 1.7.0
diff --git a/native_extension/ane/air_package.json b/native_extension/ane/air_package.json
index 7e2b448..55d5043 100644
--- a/native_extension/ane/air_package.json
+++ b/native_extension/ane/air_package.json
@@ -1,12 +1,12 @@
{
"name": "com.tuarua.VibrationANE",
- "version": "1.6.0",
+ "version": "1.7.0",
"repository": {
"url": "https://tuarua.github.io/air/air_packages.json"
},
"dependencies": {
- "com.tuarua.frekotlin": "1.41.0",
- "com.tuarua.iOS.FreSwift": "5.0.0",
- "com.tuarua.VibrationANE.IosDependencies": "1.6.0"
+ "com.tuarua.frekotlin": "1.42.0",
+ "com.tuarua.iOS.FreSwift": "5.1.0",
+ "com.tuarua.VibrationANE.IosDependencies": "1.7.0"
}
}
\ No newline at end of file
diff --git a/native_extension/ane/build.sh b/native_extension/ane/build.sh
index 413f1e3..3efb410 100755
--- a/native_extension/ane/build.sh
+++ b/native_extension/ane/build.sh
@@ -7,7 +7,7 @@ PROJECTNAME=VibrationANE
fwSuffix="_FW"
libSuffix="_LIB"
-AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.300"
+AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.345"
if [ ! -d "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphonesimulator/" ]; then
echo "No Simulator build. Build using Xcode"
diff --git a/native_extension/ane/extension.xml b/native_extension/ane/extension.xml
index 54960bf..1595fbd 100644
--- a/native_extension/ane/extension.xml
+++ b/native_extension/ane/extension.xml
@@ -3,7 +3,7 @@
com.tuarua.VibrationANE
Vibration ANE
This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd.
- 1.6.0
+ 1.7.0
diff --git a/native_library/android/VibrationANE/.idea/modules/app/VibrationANE.app.iml b/native_library/android/VibrationANE/.idea/modules/app/VibrationANE.app.iml
index a0b22d1..4389037 100644
--- a/native_library/android/VibrationANE/.idea/modules/app/VibrationANE.app.iml
+++ b/native_library/android/VibrationANE/.idea/modules/app/VibrationANE.app.iml
@@ -32,7 +32,7 @@
-
+
@@ -40,24 +40,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -80,10 +66,9 @@
-
-
-
+
+
-
+
\ No newline at end of file
diff --git a/native_library/android/VibrationANE/app/build.gradle b/native_library/android/VibrationANE/app/build.gradle
index 29ff235..1521a49 100644
--- a/native_library/android/VibrationANE/app/build.gradle
+++ b/native_library/android/VibrationANE/app/build.gradle
@@ -1,6 +1,5 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 29
@@ -9,7 +8,7 @@ android {
minSdkVersion 19
targetSdkVersion 29
versionCode 1
- versionName "1.6.0"
+ versionName "1.7.0"
}
buildTypes {
release {
diff --git a/native_library/android/VibrationANE/build.gradle b/native_library/android/VibrationANE/build.gradle
index df3f9ee..a901758 100644
--- a/native_library/android/VibrationANE/build.gradle
+++ b/native_library/android/VibrationANE/build.gradle
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.4.10'
- ext.frekotlin_version = '1.41.0'
+ ext.kotlin_version = '1.4.21'
+ ext.frekotlin_version = '1.42.0'
repositories {
google()
jcenter()
diff --git a/native_library/apple/VibrationANE/Cartfile b/native_library/apple/VibrationANE/Cartfile
index 61937dd..d4dc080 100644
--- a/native_library/apple/VibrationANE/Cartfile
+++ b/native_library/apple/VibrationANE/Cartfile
@@ -1 +1 @@
-binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.0.0/FreSwift.json" ~> 5.0.0
\ No newline at end of file
+binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.1.0/FreSwift.json" ~> 5.1.0
\ No newline at end of file
diff --git a/native_library/apple/VibrationANE/VibrationANE.xcodeproj/project.pbxproj b/native_library/apple/VibrationANE/VibrationANE.xcodeproj/project.pbxproj
index 7e8e371..209ffa7 100644
--- a/native_library/apple/VibrationANE/VibrationANE.xcodeproj/project.pbxproj
+++ b/native_library/apple/VibrationANE/VibrationANE.xcodeproj/project.pbxproj
@@ -221,7 +221,7 @@
CE87F45D1FB259C9005CF7DF /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 1210;
+ LastUpgradeCheck = 1230;
ORGANIZATIONNAME = "Tua Rua Ltd";
TargetAttributes = {
CE87F4741FB259DB005CF7DF = {