diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c72e8c..d5ec93f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 1.4.0 +- AND: Updated to FreKotlin 1.8.0 +- Updated to AIR 33 ARM 64bit + ### 1.3.0 - WIN: C# binaries are now packaged inside the ANE. All of these need to be deleted from your AIRSDK - WIN: FreSharp.ane is now a required dependency for Windows. 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/.actionScriptProperties b/example-mobile/.actionScriptProperties index 656c732..03dd1c0 100644 --- a/example-mobile/.actionScriptProperties +++ b/example-mobile/.actionScriptProperties @@ -40,9 +40,9 @@ - + - + @@ -73,9 +73,9 @@ - + - + diff --git a/example-mobile/.idea/libraries/com_tuarua_frekotlin.xml b/example-mobile/.idea/libraries/com_tuarua_frekotlin_1_8_0.xml similarity index 67% rename from example-mobile/.idea/libraries/com_tuarua_frekotlin.xml rename to example-mobile/.idea/libraries/com_tuarua_frekotlin_1_8_0.xml index 5b464a6..1120a3d 100644 --- a/example-mobile/.idea/libraries/com_tuarua_frekotlin.xml +++ b/example-mobile/.idea/libraries/com_tuarua_frekotlin_1_8_0.xml @@ -1,7 +1,7 @@ - + - + diff --git a/example-mobile/.idea/libraries/org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_1.xml b/example-mobile/.idea/libraries/org_jetbrains_kotlinx_kotlinx_coroutines_android_1_2_2.xml similarity index 75% rename from example-mobile/.idea/libraries/org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_1.xml rename to example-mobile/.idea/libraries/org_jetbrains_kotlinx_kotlinx_coroutines_android_1_2_2.xml index 50c3d65..c6b89ed 100644 --- a/example-mobile/.idea/libraries/org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_1.xml +++ b/example-mobile/.idea/libraries/org_jetbrains_kotlinx_kotlinx_coroutines_android_1_2_2.xml @@ -1,7 +1,7 @@ - + - + diff --git a/example-mobile/.idea/misc.xml b/example-mobile/.idea/misc.xml index 6800f1c..b164eff 100644 --- a/example-mobile/.idea/misc.xml +++ b/example-mobile/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/example-mobile/.idea/runConfigurations/Android_Device.xml b/example-mobile/.idea/runConfigurations/Android_Device.xml index d323ff9..ca78853 100644 --- a/example-mobile/.idea/runConfigurations/Android_Device.xml +++ b/example-mobile/.idea/runConfigurations/Android_Device.xml @@ -1,10 +1,12 @@ - + \ No newline at end of file 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 @@ - + \ No newline at end of file diff --git a/example-mobile/ZipANESample-mobile.iml b/example-mobile/ZipANESample-mobile.iml index 6b4fb8f..51f8d7d 100644 --- a/example-mobile/ZipANESample-mobile.iml +++ b/example-mobile/ZipANESample-mobile.iml @@ -17,19 +17,23 @@ - + + + + - + + - + @@ -38,6 +42,7 @@ + @@ -47,18 +52,9 @@ - - - - - - - - - @@ -68,8 +64,8 @@ - - + + @@ -85,18 +81,9 @@ - - - - - - - - - @@ -107,7 +94,7 @@ - + @@ -125,7 +112,7 @@ - + @@ -134,5 +121,7 @@ + + \ No newline at end of file diff --git a/example-mobile/get_android_dependencies.ps1 b/example-mobile/get_android_dependencies.ps1 index 330c583..7024c2e 100644 --- a/example-mobile/get_android_dependencies.ps1 +++ b/example-mobile/get_android_dependencies.ps1 @@ -1,11 +1,12 @@ -$AneVersion = "1.3.0" +$AneVersion = "1.4.0" +$FreKotlinVersion = "1.8.0" $GsonVersion = "2.8.4" -$KotlinxCoroutinesVersion = "1.0.1" +$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.ane?raw=true -Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.tuarua.frekotlin.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/com.tuarua.frekotlin.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 81fda05..2d6e9a3 100644 --- a/example-mobile/get_android_dependencies.sh +++ b/example-mobile/get_android_dependencies.sh @@ -1,10 +1,11 @@ #!/bin/sh -AneVersion="1.3.0" +AneVersion="1.4.0" +FreKotlinVersion="1.8.0" GsonVersion="2.8.4" -KotlinxCoroutinesVersion="1.0.1" +KotlinxCoroutinesVersion="1.2.2" -wget -O android_dependencies/com.tuarua.frekotlin.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/kotlin/com.tuarua.frekotlin.ane?raw=true +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.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/get_ios_dependencies.sh b/example-mobile/get_ios_dependencies.sh index 08c420f..8184713 100755 --- a/example-mobile/get_ios_dependencies.sh +++ b/example-mobile/get_ios_dependencies.sh @@ -1,6 +1,6 @@ #!/bin/sh -AneVersion="1.3.0" +AneVersion="1.4.0" FreSwiftVersion="3.1.0" rm -r ios_dependencies/device diff --git a/example-mobile/src/Main-app.xml b/example-mobile/src/Main-app-android.xml similarity index 83% rename from example-mobile/src/Main-app.xml rename to example-mobile/src/Main-app-android.xml index 099940d..3c8f307 100644 --- a/example-mobile/src/Main-app.xml +++ b/example-mobile/src/Main-app-android.xml @@ -1,5 +1,5 @@ - + ZipANESample - 1.1.0 + 1.4.0 @@ -58,6 +58,7 @@ + @@ -77,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 d27f096..6cc365c 100755 --- a/native_extension/ane/build.sh +++ b/native_extension/ane/build.sh @@ -8,21 +8,21 @@ PROJECTNAME=ZipANE fwSuffix="_FW" libSuffix="_LIB" -AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_32" +AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33" ############################################################################## -if [[ ! -d "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release/" ]]; then +if [ ! -d "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release/" ]; then echo "No OSX build. Build using Xcode" exit fi -if [[ ! -d "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphonesimulator/" ]]; then +if [ ! -d "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphonesimulator/" ]; then echo "No Simulator build. Build using Xcode" exit fi -if [[ ! -d "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphoneos/" ]]; then +if [ ! -d "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphoneos/" ]; then echo "No Device build. Build using Xcode" exit fi @@ -30,33 +30,33 @@ fi #Setup the directory. echo "Making directories." -if [[ ! -d "$pathtome/platforms" ]]; then +if [ ! -d "$pathtome/platforms" ]; then mkdir "$pathtome/platforms" fi -if [[ ! -d "$pathtome/platforms/ios" ]]; then +if [ ! -d "$pathtome/platforms/ios" ]; then mkdir "$pathtome/platforms/ios" fi -if [[ ! -d "$pathtome/platforms/ios/simulator" ]]; then +if [ ! -d "$pathtome/platforms/ios/simulator" ]; then mkdir "$pathtome/platforms/ios/simulator" fi -if [[ ! -d "$pathtome/platforms/ios/simulator/Frameworks" ]]; then +if [ ! -d "$pathtome/platforms/ios/simulator/Frameworks" ]; then mkdir "$pathtome/platforms/ios/simulator/Frameworks" fi -if [[ ! -d "$pathtome/platforms/ios/device" ]]; then +if [ ! -d "$pathtome/platforms/ios/device" ]; then mkdir "$pathtome/platforms/ios/device" fi -if [[ ! -d "$pathtome/platforms/ios/device/Frameworks" ]]; then +if [ ! -d "$pathtome/platforms/ios/device/Frameworks" ]; then mkdir "$pathtome/platforms/ios/device/Frameworks" fi -if [[ ! -d "$pathtome/platforms/mac" ]]; then +if [ ! -d "$pathtome/platforms/mac" ]; then mkdir "$pathtome/platforms/mac" fi -if [[ ! -d "$pathtome/platforms/mac/release" ]]; then +if [ ! -d "$pathtome/platforms/mac/release" ]; then mkdir "$pathtome/platforms/mac/release" fi -if [[ ! -d "$pathtome/platforms/mac/release/Frameworks" ]]; then +if [ ! -d "$pathtome/platforms/mac/release/Frameworks" ]; then mkdir "$pathtome/platforms/mac/release/Frameworks" fi @@ -82,56 +82,56 @@ cp "$pathtome/library.swf" "$pathtome/platforms/android" ############################################################################## # OSX FWPATH="$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release/$PROJECTNAME.framework/Versions/A/Frameworks" -if [[ -f "$FWPATH/libswiftAppKit.dylib" ]]; then +if [ -f "$FWPATH/libswiftAppKit.dylib" ]; then rm "$FWPATH/libswiftAppKit.dylib" fi -if [[ -f "$FWPATH/libswiftCore.dylib" ]]; then +if [ -f "$FWPATH/libswiftCore.dylib" ]; then rm "$FWPATH/libswiftCore.dylib" fi -if [[ -f "$FWPATH/libswiftCoreData.dylib" ]]; then +if [ -f "$FWPATH/libswiftCoreData.dylib" ]; then rm "$FWPATH/libswiftCoreData.dylib" fi -if [[ -f "$FWPATH/libswiftCoreFoundation.dylib" ]]; then +if [ -f "$FWPATH/libswiftCoreFoundation.dylib" ]; then rm "$FWPATH/libswiftCoreFoundation.dylib" fi -if [[ -f "$FWPATH/libswiftCoreGraphics.dylib" ]]; then +if [ -f "$FWPATH/libswiftCoreGraphics.dylib" ]; then rm "$FWPATH/libswiftCoreGraphics.dylib" fi -if [[ -f "$FWPATH/libswiftCoreImage.dylib" ]]; then +if [ -f "$FWPATH/libswiftCoreImage.dylib" ]; then rm "$FWPATH/libswiftCoreImage.dylib" fi -if [[ -f "$FWPATH/libswiftDarwin.dylib" ]]; then +if [ -f "$FWPATH/libswiftDarwin.dylib" ]; then rm "$FWPATH/libswiftDarwin.dylib" fi -if [[ -f "$FWPATH/libswiftDispatch.dylib" ]]; then +if [ -f "$FWPATH/libswiftDispatch.dylib" ]; then rm "$FWPATH/libswiftDispatch.dylib" fi -if [[ -f "$FWPATH/libswiftFoundation.dylib" ]]; then +if [ -f "$FWPATH/libswiftFoundation.dylib" ]; then rm "$FWPATH/libswiftFoundation.dylib" fi -if [[ -f "$FWPATH/libswiftIOKit.dylib" ]]; then +if [ -f "$FWPATH/libswiftIOKit.dylib" ]; then rm "$FWPATH/libswiftIOKit.dylib" fi -if [[ -f "$FWPATH/libswiftMetal.dylib" ]]; then +if [ -f "$FWPATH/libswiftMetal.dylib" ]; then rm "$FWPATH/libswiftMetal.dylib" fi -if [[ -f "$FWPATH/libswiftObjectiveC.dylib" ]]; then +if [ -f "$FWPATH/libswiftObjectiveC.dylib" ]; then rm "$FWPATH/libswiftObjectiveC.dylib" fi -if [[ -f "$FWPATH/libswiftos.dylib" ]]; then +if [ -f "$FWPATH/libswiftos.dylib" ]; then rm "$FWPATH/libswiftos.dylib" fi -if [[ -f "$FWPATH/libswiftQuartzCore.dylib" ]]; then +if [ -f "$FWPATH/libswiftQuartzCore.dylib" ]; then rm "$FWPATH/libswiftQuartzCore.dylib" fi -if [[ -f "$FWPATH/libswiftXPC.dylib" ]]; then +if [ -f "$FWPATH/libswiftXPC.dylib" ]; then rm "$FWPATH/libswiftXPC.dylib" fi #Copy native libraries into place. echo "Copying native libraries into place." cp -R -L "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release/$PROJECTNAME.framework" "$pathtome/platforms/mac/release" -if [[ -d "$pathtome/platforms/mac/release/$PROJECTNAME.framework/Versions/A/Frameworks" ]]; then +if [ -d "$pathtome/platforms/mac/release/$PROJECTNAME.framework/Versions/A/Frameworks" ]; then mv "$pathtome/platforms/mac/release/$PROJECTNAME.framework/Versions/A/Frameworks" "$pathtome/platforms/mac/release/$PROJECTNAME.framework" fi rm -r "$pathtome/platforms/mac/release/$PROJECTNAME.framework/Versions" @@ -162,38 +162,38 @@ cp -R -L "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Relea echo "Copying Swift dylibs into place for device." #Device -if [[ -e "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks" ]] +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" +mv -f "$dylib" "$pathtome/../../example-mobile/ios_dependencies/device/Frameworks" done rm -r "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks" fi echo "Copying Swift dylibs into place for simulator." #Simulator -if [[ -e "$pathtome/platforms/ios/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks" ]] +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" +mv -f "$dylib" "$pathtome/../../example-mobile/ios_dependencies/simulator/Frameworks" done -if [[ -d "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks" ]]; then +if [ -d "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks" ]; then rm -r "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks" fi fi -if [[ -f "$pathtome/../../example-mobile/ios_dependencies/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" ]]; then +if [ -f "$pathtome/../../example-mobile/ios_dependencies/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" ]; then rm "$pathtome/../../example-mobile/ios_dependencies/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" fi -if [[ -f "$pathtome/../../example-mobile/ios_dependencies/device/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" ]]; then +if [ -f "$pathtome/../../example-mobile/ios_dependencies/device/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" ]; then rm "$pathtome/../../example-mobile/ios_dependencies/device/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" fi -if [[ -f "$pathtome/platforms/ios/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" ]]; then +if [ -f "$pathtome/platforms/ios/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" ]; then rm "$pathtome/platforms/ios/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" fi -if [[ -f "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" ]]; then +if [ -f "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" ]; then rm "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" fi @@ -211,9 +211,11 @@ 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-x86 -C "$pathtome/platforms/android" "library.swf" "classes.jar" com.tuarua.${PROJECTNAME}-res/. \ +-platform Android-ARM64 -C "$pathtome/platforms/android" "library.swf" "classes.jar" com.tuarua.${PROJECTNAME}-res/. \ -platformoptions "$pathtome/platforms/android/platform.xml" \ -platform MacOS-x86-64 -C "$pathtome/platforms/mac/release" ${PROJECTNAME}.framework "library.swf" \ -platform Windows-x86 -C "$pathtome/platforms/win/x86/release" ${PROJECTNAME}.dll ${PROJECTNAME}Lib.dll "Newtonsoft.Json.dll" "library.swf" \ diff --git a/native_extension/ane/extension.xml b/native_extension/ane/extension.xml index d131b9b..1479e65 100644 --- a/native_extension/ane/extension.xml +++ b/native_extension/ane/extension.xml @@ -3,7 +3,7 @@ com.tuarua.ZipANE Zip ANE This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd. - 1.3.0 + 1.4.0 @@ -43,6 +43,13 @@ + + + classes.jar + com.tuarua.ZipANE + com.tuarua.ZipANE + + classes.jar @@ -50,7 +57,7 @@ com.tuarua.ZipANE - + classes.jar com.tuarua.ZipANE diff --git a/native_extension/ane/extension_win.xml b/native_extension/ane/extension_win.xml index 654f0cf..76c3b7c 100644 --- a/native_extension/ane/extension_win.xml +++ b/native_extension/ane/extension_win.xml @@ -3,7 +3,7 @@ com.tuarua.ZipANE Zip ANE This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd. - 1.3.0 + 1.4.0 diff --git a/native_library/android/ZipANE/.idea/codeStyles/Project.xml b/native_library/android/ZipANE/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/native_library/android/ZipANE/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/native_library/android/ZipANE/.idea/misc.xml b/native_library/android/ZipANE/.idea/misc.xml index 51fa3e5..cc04cd3 100644 --- a/native_library/android/ZipANE/.idea/misc.xml +++ b/native_library/android/ZipANE/.idea/misc.xml @@ -35,7 +35,7 @@ - + diff --git a/native_library/android/ZipANE/ZipANE.iml b/native_library/android/ZipANE/ZipANE.iml index 967a6f0..750255b 100644 --- a/native_library/android/ZipANE/ZipANE.iml +++ b/native_library/android/ZipANE/ZipANE.iml @@ -8,7 +8,7 @@ - + diff --git a/native_library/android/ZipANE/app/app.iml b/native_library/android/ZipANE/app/app.iml index f094722..a9d9f87 100644 --- a/native_library/android/ZipANE/app/app.iml +++ b/native_library/android/ZipANE/app/app.iml @@ -17,22 +17,23 @@ - - - + + + - + - + - + - + @@ -117,43 +125,44 @@ - - + + + + - - - + + + - - + - - - + + + + + + + - - - - + - + - - - - + + + + - - - + + \ No newline at end of file diff --git a/native_library/android/ZipANE/app/build.gradle b/native_library/android/ZipANE/app/build.gradle index d8c6b82..da454f6 100644 --- a/native_library/android/ZipANE/app/build.gradle +++ b/native_library/android/ZipANE/app/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 27 - buildToolsVersion "27.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 19 - targetSdkVersion 27 + targetSdkVersion compileSdkVersion versionCode 1 versionName "1.0" } @@ -17,12 +17,17 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility = '1.8' + targetCompatibility = '1.8' + } } dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "com.google.code.gson:gson:$gson_version" implementation "com.tuarua:FreKotlin:$frekotlin_version" - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.1' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.2' } repositories { mavenCentral() diff --git a/native_library/android/ZipANE/build.gradle b/native_library/android/ZipANE/build.gradle index 695e55b..cde0e14 100644 --- a/native_library/android/ZipANE/build.gradle +++ b/native_library/android/ZipANE/build.gradle @@ -1,15 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.30' + ext.kotlin_version = '1.3.40' ext.gson_version = '2.8.4' - ext.frekotlin_version = '1.7.0' + ext.frekotlin_version = '1.8.0' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + 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 diff --git a/native_library/android/ZipANE/gradle/wrapper/gradle-wrapper.properties b/native_library/android/ZipANE/gradle/wrapper/gradle-wrapper.properties index e8fed7e..3da6674 100644 --- a/native_library/android/ZipANE/gradle/wrapper/gradle-wrapper.properties +++ b/native_library/android/ZipANE/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 27 23:04:41 GMT 2017 +#Fri Jun 28 00:57:22 BST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip