Merge pull request #21 from tuarua/development

1.6.0

CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.6.0
+- AND: Updated to FreKotlin 1.41.0
+- iOS: Updated to FreSwift 5.0.0
+- Upgraded to AIR 33.1.1.300
+
 ### 1.5.0
 - AND: Updated to FreKotlin 1.40.0
 - iOS: Updated to FreSwift 4.5.0

README.md

@@ -12,7 +12,7 @@ You will need:
 
 - IntelliJ IDEA
 - AIR 33.1.1.217+
-- Xcode 11.6
+- Xcode 12.1
 - [.Net Core Runtime](https://dotnet.microsoft.com/download/dotnet-core/3.1)
 - [AIR-Tools](https://github.com/tuarua/AIR-Tools/)
 

example/VibrationANESample.iml

@@ -12,7 +12,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.190" />
+          <sdk name="AIRSDK_33.1.1.300" />
         </dependencies>
         <compiler-options>
           <map>
@@ -43,7 +43,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.190" />
+          <sdk name="AIRSDK_33.1.1.300" />
         </dependencies>
         <compiler-options>
           <map>
@@ -72,7 +72,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_33.1.1.190" />
+          <sdk name="AIRSDK_33.1.1.300" />
         </dependencies>
         <compiler-options>
           <map>
@@ -99,7 +99,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.190" jdkType="Flex SDK Type (new)" />
+    <orderEntry type="jdk" jdkName="AIRSDK_33.1.1.300" 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" />

example/air_package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibration-sample",
-  "version": "1.5.0",
+  "version": "1.6.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.5.0"
+    "com.tuarua.VibrationANE": "1.6.0"
   }
 }

example/src/Main-app.xml

@@ -4,7 +4,7 @@
 	<id>com.tuarua.vibrationanesample</id>
 	<filename>VibrationANESample</filename>
 	<name>VibrationANESample</name>
-	<versionNumber>1.2.0</versionNumber>
+	<versionNumber>1.6.0</versionNumber>
 
 
 	<initialWindow>
@@ -30,7 +30,7 @@
 <android>
         <manifestAdditions><![CDATA[
             <manifest android:installLocation="auto">
-                <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+                <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
                 <uses-permission android:name="android.permission.INTERNET"/>
                 <uses-permission android:name="android.permission.VIBRATE"/>
                 <application android:enabled="true">

native_extension/ane/air_package.json

@@ -1,12 +1,12 @@
 {
   "name": "com.tuarua.VibrationANE",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "repository": {
     "url": "https://tuarua.github.io/air/air_packages.json"
   },
   "dependencies": {
-    "com.tuarua.frekotlin": "1.40.0",
-    "com.tuarua.iOS.FreSwift": "4.5.0",
-    "com.tuarua.VibrationANE.IosDependencies": "1.5.0"
+    "com.tuarua.frekotlin": "1.41.0",
+    "com.tuarua.iOS.FreSwift": "5.0.0",
+    "com.tuarua.VibrationANE.IosDependencies": "1.6.0"
   }
 }

native_extension/ane/build.sh

@@ -7,7 +7,7 @@ PROJECTNAME=VibrationANE
 fwSuffix="_FW"
 libSuffix="_LIB"
 
-AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33"
+AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.300"
 
 if [ ! -d "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphonesimulator/" ]; then
 echo "No Simulator build. Build using Xcode"

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.5.0</versionNumber>
+	<versionNumber>1.6.0</versionNumber>
     <platforms>
         <platform name="Android-x86">
             <applicationDeployment>

native_extension/ane/platforms/ios/platform.xml

@@ -6,6 +6,7 @@
         <option>-w</option>
         <option>-ObjC</option>
         <option>-rpath @executable_path/Frameworks</option>
+        <option>-rpath /usr/lib/swift</option>
     </linkerOptions>
 
     <packagedDependencies>

native_library/android/VibrationANE/VibrationANE.iml

@@ -8,10 +8,11 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />