Merge pull request #22 from tuarua/development

1.7.0
tuarua · Dec 31, 2020 · afaf666 · afaf666
2 parents 946aa71 + a742cd4
commit afaf666
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 46 deletions.
diff --git 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
@@ -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
diff --git a/example/.idea/runConfigurations/iOS_Simulator.xml b/example/.idea/runConfigurations/iOS_Simulator.xml
diff --git a/example/VibrationANESample.iml b/example/VibrationANESample.iml
@@ -12,7 +12,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.300" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <map>
@@ -43,7 +43,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.300" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <map>
@@ -59,7 +59,7 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system" path-in-package="." />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/assets" path-in-package="." />
           </files-to-package>
-          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/tua_rua_dev_2020.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
+          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/tua_rua_dev_2021.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
         </packaging-ios>
       </configuration>
       <configuration name="iOS Device" target-platform="Mobile" pure-as="true" main-class="Main" output-file="iOS_Device.swf" output-folder="$MODULE_DIR$/bin-release">
@@ -72,7 +72,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.300" />
+          <sdk name="AIRSDK_33.1.1.345" />
         </dependencies>
         <compiler-options>
           <map>
@@ -88,7 +88,7 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system" path-in-package="." />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/assets" path-in-package="." />
           </files-to-package>
-          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/tua_rua_dev_2020.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
+          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/tua_rua_dev_2021.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2021/iOS/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
         </packaging-ios>
       </configuration>
     </configurations>
@@ -99,14 +99,14 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.300" jdkType="Flex SDK Type (new)" />
+    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.345" jdkType="Flex SDK Type (new)" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="starling" level="project" />
     <orderEntry type="library" exported="" name="com.tuarua.frekotlin" level="project" />
     <orderEntry type="library" exported="" name="VibrationANE" level="project" />
     <orderEntry type="library" exported="" name="com.tuarua.frekotlin-1.8.0" level="project" />
     <orderEntry type="library" exported="" name="com.tuarua.frekotlin-1.9.5" level="project" />
     <orderEntry type="library" exported="" name="com.tuarua.frekotlin-1.10.0" level="project" />
+    <orderEntry type="library" exported="" name="starling" level="project" />
     <orderEntry type="library" exported="" name="extensions" level="project" />
   </component>
 </module>
diff --git 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
@@ -4,7 +4,7 @@
 	<id>com.tuarua.vibrationanesample</id>
 	<filename>VibrationANESample</filename>
 	<name>VibrationANESample</name>
-	<versionNumber>1.6.0</versionNumber>
+	<versionNumber>1.7.0</versionNumber>
 
 
 	<initialWindow>

diff --git 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"
   }
 }
diff --git 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
@@ -3,7 +3,7 @@
     <id>com.tuarua.VibrationANE</id>
 	<name>Vibration ANE</name>
 	<copyright>This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd.</copyright>
-	<versionNumber>1.6.0</versionNumber>
+	<versionNumber>1.7.0</versionNumber>
     <platforms>
         <platform name="Android-x86">
             <applicationDeployment>

diff --git a/native_library/android/VibrationANE/.idea/modules/app/VibrationANE.app.iml b/native_library/android/VibrationANE/.idea/modules/app/VibrationANE.app.iml
diff --git 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
@@ -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
@@ -1 +1 @@
-binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.0.0/FreSwift.json" ~> 5.0.0
+binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.1.0/FreSwift.json" ~> 5.1.0
diff --git 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 = {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.0.0/FreSwift.json" ~> 5.0.0
		binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.1.0/FreSwift.json" ~> 5.1.0