diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbc5292..d5ec93f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,6 @@
### 1.4.0
- AND: Updated to FreKotlin 1.8.0
- Updated to AIR 33 ARM 64bit
-- Remove Android-x86
### 1.3.0
- WIN: C# binaries are now packaged inside the ANE. All of these need to be deleted from your AIRSDK
diff --git a/README.md b/README.md
index 0f0f765..96ea32d 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,9 @@ You will also need to include the following in your app manifest. Update accordi
```
+#### AIR 32 & 33
+This ANE is built against AIR 33 SDK. If you wish to use with AIR 32 you will need to replace dx.jar in lib/android/bin/ with [this one](https://github.com/tuarua/Android-ANE-Dependencies/blob/master/AIR32_patch/lib/android/bin/dx.jar?raw=true)
+
-------------
## iOS
@@ -118,6 +121,9 @@ bash get_ios_dependencies.sh
This folder, ios_dependencies/device/Frameworks, must be packaged as part of your app when creating the ipa. How this is done will depend on the IDE you are using.
After the ipa is created unzip it and confirm there is a "Frameworks" folder in the root of the .app package.
+#### AIR 32 & 33
+You should use AIR 32 for iOS builds
+
### Prerequisites
You will need:
@@ -125,6 +131,7 @@ You will need:
- IntelliJ IDEA / Flash Builder
- AIR 32.0.0.103 or greater
- Android Studio 3 if you wish to edit the Android source
+- Xcode 10.1
- wget on macOS
- Powershell on Windows
diff --git a/example-mobile/.idea/runConfigurations/iOS_Simulator.xml b/example-mobile/.idea/runConfigurations/iOS_Simulator.xml
index 9f246a8..6eb0a64 100644
--- a/example-mobile/.idea/runConfigurations/iOS_Simulator.xml
+++ b/example-mobile/.idea/runConfigurations/iOS_Simulator.xml
@@ -1,10 +1,12 @@
-
+
-
+
+
+
@@ -32,6 +34,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/example-mobile/ZipANESample-mobile.iml b/example-mobile/ZipANESample-mobile.iml
index d829feb..51f8d7d 100644
--- a/example-mobile/ZipANESample-mobile.iml
+++ b/example-mobile/ZipANESample-mobile.iml
@@ -33,7 +33,7 @@
-
+
@@ -52,23 +52,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
@@ -93,23 +81,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -136,7 +112,7 @@
-
+
diff --git a/example-mobile/get_android_dependencies.ps1 b/example-mobile/get_android_dependencies.ps1
index 6a232cd..7024c2e 100644
--- a/example-mobile/get_android_dependencies.ps1
+++ b/example-mobile/get_android_dependencies.ps1
@@ -6,7 +6,7 @@ $KotlinxCoroutinesVersion = "1.2.2"
$currentDir = (Get-Item -Path ".\" -Verbose).FullName
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Invoke-WebRequest -Uri https://github.com/tuarua/Zip-ANE/releases/download/$AneVersion/ZipANE.ane?raw=true -OutFile "$currentDir\..\native_extension\ane\ZipANE.ane"
-Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.code.gson.gson-$GsonVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/com.google.code.gson.gson-$GsonVersion-air33.ane?raw=true
+Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.code.gson.gson-$GsonVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/com.google.code.gson.gson-$GsonVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.tuarua.frekotlin-$FreKotlinVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/com.tuarua.frekotlin-$FreKotlinVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\org.jetbrains.kotlinx.kotlinx-coroutines-android-$KotlinxCoroutinesVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/org.jetbrains.kotlinx.kotlinx-coroutines-android-$KotlinxCoroutinesVersion.ane?raw=true
diff --git a/example-mobile/get_android_dependencies.sh b/example-mobile/get_android_dependencies.sh
index 283fc49..2d6e9a3 100644
--- a/example-mobile/get_android_dependencies.sh
+++ b/example-mobile/get_android_dependencies.sh
@@ -7,5 +7,5 @@ KotlinxCoroutinesVersion="1.2.2"
wget -O android_dependencies/com.tuarua.frekotlin-$FreKotlinVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/com.tuarua.frekotlin-$FreKotlinVersion.ane?raw=true
wget -O android_dependencies/org.jetbrains.kotlinx.kotlinx-coroutines-android-$KotlinxCoroutinesVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/org.jetbrains.kotlinx.kotlinx-coroutines-android-$KotlinxCoroutinesVersion.ane?raw=true
-wget -O android_dependencies/com.google.code.gson.gson-$GsonVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/com.google.code.gson.gson-$GsonVersion-air33.ane?raw=true
+wget -O android_dependencies/com.google.code.gson.gson-$GsonVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/com.google.code.gson.gson-$GsonVersion.ane?raw=true
wget -O ../native_extension/ane/ZipANE.ane https://github.com/tuarua/Zip-ANE/releases/download/$AneVersion/ZipANE.ane?raw=true
diff --git a/example-mobile/src/Main-app.xml b/example-mobile/src/Main-app-android.xml
similarity index 86%
rename from example-mobile/src/Main-app.xml
rename to example-mobile/src/Main-app-android.xml
index 7085179..3c8f307 100644
--- a/example-mobile/src/Main-app.xml
+++ b/example-mobile/src/Main-app-android.xml
@@ -78,24 +78,6 @@
-
-
-
-
- UIDeviceFamily
-
-
- 1
-
- 2
-
- MinimumOSVersion
- 9.0
- ]]>
-
- high
-
com.tuarua.frekotlin
org.jetbrains.kotlinx.kotlinx-coroutines-android
diff --git a/example-mobile/src/Main-app-ios.xml b/example-mobile/src/Main-app-ios.xml
new file mode 100644
index 0000000..faafee1
--- /dev/null
+++ b/example-mobile/src/Main-app-ios.xml
@@ -0,0 +1,77 @@
+
+
+
+
+
+ com.tuarua.zipanesample
+
+
+ ZipANESample
+
+
+ ZipANESample
+
+ 1.4.0
+
+
+
+
+
+ [This value will be overwritten by Flash Builder in the output app.xml]
+
+
+
+ portrait
+
+
+ false
+
+
+
+ true
+
+
+ direct
+
+
+ true
+
+ true
+
+
+
+
+
+
+ AppIcon76x76~ipad.png
+ AppIcon60x60@2x.png
+ AppIcon76x76@2x~ipad.png
+ AppIcon83.5x83.5@2x~ipad.png
+ AppIcon60x60@3x.png
+
+
+
+
+
+
+ UIDeviceFamily
+
+
+ 1
+
+ 2
+
+ MinimumOSVersion
+ 9.0
+ ]]>
+
+ high
+
+
+ com.tuarua.ZipANE
+
+
diff --git a/native_extension/ane/build.sh b/native_extension/ane/build.sh
index 0faa70c..6cc365c 100755
--- a/native_extension/ane/build.sh
+++ b/native_extension/ane/build.sh
@@ -164,7 +164,7 @@ echo "Copying Swift dylibs into place for device."
#Device
if [ -e "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks" ]
then
-for dylib in "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks/*"
+for dylib in "$pathtome"/platforms/ios/device/Frameworks/"$PROJECTNAME""$fwSuffix".framework/Frameworks/*
do
mv -f "$dylib" "$pathtome/../../example-mobile/ios_dependencies/device/Frameworks"
done
@@ -175,7 +175,7 @@ echo "Copying Swift dylibs into place for simulator."
#Simulator
if [ -e "$pathtome/platforms/ios/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks" ]
then
-for dylib in "$pathtome/platforms/ios/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks/*"
+for dylib in "$pathtome"/platforms/ios/simulator/Frameworks/"$PROJECTNAME""$fwSuffix".framework/Frameworks/*
do
mv -f "$dylib" "$pathtome/../../example-mobile/ios_dependencies/simulator/Frameworks"
done
@@ -211,6 +211,8 @@ echo "Building ANE."
-platformoptions "$pathtome/platforms/ios/platform.xml" \
-platform iPhone-ARM -C "$pathtome/platforms/ios/device" "library.swf" "Frameworks" lib${PROJECTNAME}.a \
-platformoptions "$pathtome/platforms/ios/platform.xml" \
+-platform Android-x86 -C "$pathtome/platforms/android" "library.swf" "classes.jar" com.tuarua.${PROJECTNAME}-res/. \
+-platformoptions "$pathtome/platforms/android/platform.xml" \
-platform Android-ARM -C "$pathtome/platforms/android" "library.swf" "classes.jar" com.tuarua.${PROJECTNAME}-res/. \
-platformoptions "$pathtome/platforms/android/platform.xml" \
-platform Android-ARM64 -C "$pathtome/platforms/android" "library.swf" "classes.jar" com.tuarua.${PROJECTNAME}-res/. \
diff --git a/native_extension/ane/extension.xml b/native_extension/ane/extension.xml
index 45fabc5..1479e65 100644
--- a/native_extension/ane/extension.xml
+++ b/native_extension/ane/extension.xml
@@ -43,6 +43,13 @@
+
+
+ classes.jar
+ com.tuarua.ZipANE
+ com.tuarua.ZipANE
+
+
classes.jar
diff --git a/native_library/android/ZipANE/app/app.iml b/native_library/android/ZipANE/app/app.iml
index 77a163c..a9d9f87 100644
--- a/native_library/android/ZipANE/app/app.iml
+++ b/native_library/android/ZipANE/app/app.iml
@@ -17,7 +17,7 @@
-
+
@@ -30,7 +30,7 @@
-
+
@@ -127,41 +127,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -171,7 +157,7 @@
-
+
diff --git a/native_library/android/ZipANE/build.gradle b/native_library/android/ZipANE/build.gradle
index 024b380..cde0e14 100644
--- a/native_library/android/ZipANE/build.gradle
+++ b/native_library/android/ZipANE/build.gradle
@@ -3,13 +3,13 @@
buildscript {
ext.kotlin_version = '1.3.40'
ext.gson_version = '2.8.4'
- ext.frekotlin_version = '1.8.0-beta1'
+ ext.frekotlin_version = '1.8.0'
repositories {
google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.4.1'
+ classpath 'com.android.tools.build:gradle:3.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong