From 3f8c38af4908705f2cb4d5bb8b83fe5729733d5c Mon Sep 17 00:00:00 2001 From: Eoin Landy Date: Sun, 30 Jun 2019 17:37:04 +0100 Subject: [PATCH] 1.2.0 --- CHANGELOG.md | 5 + README.md | 6 +- example/.actionScriptProperties | 3 +- ...lin.xml => com_tuarua_frekotlin_1_8_0.xml} | 4 +- example/.idea/misc.xml | 2 +- .../runConfigurations/Android_Device.xml | 8 +- example/VibrationANESample.iml | 23 +-- example/get_android_dependencies.ps1 | 7 +- example/get_android_dependencies.sh | 8 +- example/get_ios_dependencies.sh | 2 +- example/src/Main-app.xml | 4 +- native_extension/ane/build-android.bat | 52 ------- native_extension/ane/build-android.sh | 52 ------- native_extension/ane/build_ios.sh | 141 ------------------ native_extension/ane/build_mobile.sh | 19 +-- native_extension/ane/extension_android.xml | 23 --- native_extension/ane/extension_ios.xml | 23 --- native_extension/ane/extension_mobile.xml | 4 +- .../VibrationANE/.idea/codeStyles/Project.xml | 29 ---- .../android/VibrationANE/.idea/misc.xml | 2 +- .../android/VibrationANE/VibrationANE.iml | 2 +- .../android/VibrationANE/app/app.iml | 60 +++++--- .../android/VibrationANE/app/build.gradle | 13 +- .../android/VibrationANE/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- 25 files changed, 112 insertions(+), 390 deletions(-) rename example/.idea/libraries/{com_tuarua_frekotlin.xml => com_tuarua_frekotlin_1_8_0.xml} (67%) delete mode 100644 native_extension/ane/build-android.bat delete mode 100644 native_extension/ane/build-android.sh delete mode 100755 native_extension/ane/build_ios.sh delete mode 100644 native_extension/ane/extension_android.xml delete mode 100644 native_extension/ane/extension_ios.xml delete mode 100644 native_library/android/VibrationANE/.idea/codeStyles/Project.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index fd4b6b5..a39d0f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +### 1.2.0 +- AND: Updated to FreKotlin 1.8.0 +- Updated to AIR 33 ARM 64bit +- Remove Android-x86 + ### 1.1.0 - Upgraded to AIR 32.0.0.116 - AND: Updated to FreKotlin 1.7.0 diff --git a/README.md b/README.md index cf9b5c2..1fcff00 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Vibration Adobe Air Native Extension for iOS 9.0+ and Android 19+. #### The ANE + Dependencies cd into /example and run: -- OSX (Terminal) +- macOS (Terminal) ```shell bash get_android_dependencies.sh ``` @@ -58,10 +58,10 @@ After the ipa is created unzip it and confirm there is a "Frameworks" folder in You will need: - IntelliJ IDEA / Flash Builder -- AIR 32.0.0.103 or greater +- AIR 33 or greater - Android Studio 3 if you wish to edit the Android source - Xcode 10.1 -- wget on OSX +- wget on macOS - Powershell on Windows ### References diff --git a/example/.actionScriptProperties b/example/.actionScriptProperties index 5ad352f..fc24c58 100644 --- a/example/.actionScriptProperties +++ b/example/.actionScriptProperties @@ -36,7 +36,7 @@ - + @@ -55,6 +55,7 @@ + diff --git a/example/.idea/libraries/com_tuarua_frekotlin.xml b/example/.idea/libraries/com_tuarua_frekotlin_1_8_0.xml similarity index 67% rename from example/.idea/libraries/com_tuarua_frekotlin.xml rename to example/.idea/libraries/com_tuarua_frekotlin_1_8_0.xml index 5b464a6..1120a3d 100644 --- a/example/.idea/libraries/com_tuarua_frekotlin.xml +++ b/example/.idea/libraries/com_tuarua_frekotlin_1_8_0.xml @@ -1,7 +1,7 @@ - + - + diff --git a/example/.idea/misc.xml b/example/.idea/misc.xml index 6800f1c..b164eff 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/Android_Device.xml b/example/.idea/runConfigurations/Android_Device.xml index c77cedc..4e95968 100644 --- a/example/.idea/runConfigurations/Android_Device.xml +++ b/example/.idea/runConfigurations/Android_Device.xml @@ -1,10 +1,12 @@ - + \ No newline at end of file diff --git a/example/VibrationANESample.iml b/example/VibrationANESample.iml index a25f461..f9002db 100644 --- a/example/VibrationANESample.iml +++ b/example/VibrationANESample.iml @@ -8,19 +8,20 @@ - + - + - + + @@ -31,6 +32,7 @@ + @@ -40,14 +42,14 @@ - + - + - + @@ -71,14 +73,14 @@ - + - + - + @@ -104,10 +106,11 @@ - + + \ No newline at end of file diff --git a/example/get_android_dependencies.ps1 b/example/get_android_dependencies.ps1 index 6dc49b2..ff6205f 100644 --- a/example/get_android_dependencies.ps1 +++ b/example/get_android_dependencies.ps1 @@ -1,4 +1,7 @@ +$AneVersion = "1.2.0" +$FreKotlinVersion = "1.8.0" + $currentDir = (Get-Item -Path ".\" -Verbose).FullName [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -Invoke-WebRequest -Uri https://github.com/tuarua/Vibration-ANE/releases/download/1.1.0/VibrationANE.ane?raw=true -OutFile "$currentDir\..\native_extension\ane\VibrationANE.ane" -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 -Uri https://github.com/tuarua/Vibration-ANE/releases/download/$AneVersion/VibrationANE.ane?raw=true -OutFile "$currentDir\..\native_extension\ane\VibrationANE.ane" +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 \ No newline at end of file diff --git a/example/get_android_dependencies.sh b/example/get_android_dependencies.sh index 97112cd..6570865 100644 --- a/example/get_android_dependencies.sh +++ b/example/get_android_dependencies.sh @@ -1,3 +1,7 @@ #!/bin/sh -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 ../native_extension/ane/VibrationANE.ane https://github.com/tuarua/Vibration-ANE/releases/download/1.1.0/VibrationANE.ane?raw=true + +AneVersion="1.2.0" +FreKotlinVersion="1.8.0" + +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 ../native_extension/ane/VibrationANE.ane https://github.com/tuarua/Vibration-ANE/releases/download/$AneVersion/VibrationANE.ane?raw=true diff --git a/example/get_ios_dependencies.sh b/example/get_ios_dependencies.sh index 36d624b..60eee57 100755 --- a/example/get_ios_dependencies.sh +++ b/example/get_ios_dependencies.sh @@ -1,6 +1,6 @@ #!/bin/sh -AneVersion="1.1.0" +AneVersion="1.2.0" FreSwiftVersion="3.1.0" rm -r ios_dependencies/device diff --git a/example/src/Main-app.xml b/example/src/Main-app.xml index 4fd1aad..47dd2fd 100644 --- a/example/src/Main-app.xml +++ b/example/src/Main-app.xml @@ -1,10 +1,10 @@ - + com.tuarua.vibrationanesample VibrationANESample VibrationANESample - 1.1.0 + 1.2.0 diff --git a/native_extension/ane/build-android.bat b/native_extension/ane/build-android.bat deleted file mode 100644 index b1f0c4e..0000000 --- a/native_extension/ane/build-android.bat +++ /dev/null @@ -1,52 +0,0 @@ -@echo off -SET pathtome=%~dp0 -SET SZIP="C:\Program Files\7-Zip\7z.exe" -SET AIR_PATH="D:\dev\sdks\AIR\AIRSDK_32\bin\" - -SET projectName=VibrationANE - -copy %pathtome%..\bin\%projectName%.swc %pathtome% - -REM contents of SWC. -copy /Y %pathtome%%projectName%.swc %pathtome%%projectName%Extract.swc -ren %pathtome%%projectName%Extract.swc %projectName%Extract.zip -call %SZIP% e %pathtome%%projectName%Extract.zip -o%pathtome% -del %pathtome%%projectName%Extract.zip - -REM Copy library.swf to folders. -echo Copying library.swf into place. -copy %pathtome%library.swf %pathtome%platforms\android - -echo copy the aar into place -copy /Y %pathtome%..\..\native_library\android\%projectName%\app\build\outputs\aar\app-release.aar %pathtome%platforms\android\app-release.aar - - -echo "GETTING ANDROID JAR" -call %SZIP% x %pathtome%platforms\android\app-release.aar -o%pathtome%platforms\android\ classes.jar -call %SZIP% x %pathtome%platforms\android\app-release.aar -o%pathtome%platforms\android\ res -ren %pathtome%platforms\android\res com.tuarua.%projectName%-res - -echo "GENERATING ANE" -call %AIR_PATH%adt.bat -package -target ane %pathtome%%projectName%.ane extension_android.xml ^ --swc %projectName%.swc ^ --platform Android-ARM ^ --C platforms/android library.swf classes.jar ^ -com.tuarua.%projectName%-res/. ^ --platformoptions platforms/android/platform.xml ^ --platform Android-x86 ^ --C platforms/android library.swf classes.jar ^ -com.tuarua.%projectName%-res/. ^ --platformoptions platforms/android/platform.xml - - -del %pathtome%platforms\\android\\classes.jar -del %pathtome%platforms\\android\\app-release.aar -del %pathtome%platforms\\android\\library.swf - -call DEL /F /Q /A %pathtome%library.swf -call DEL /F /Q /A %pathtome%catalog.xml -call DEL /F /Q /A %pathtome%%projectName%.swc - -call rmdir /Q /S %pathtome%platforms\android\com.tuarua.%projectName%-res - -echo "DONE!" diff --git a/native_extension/ane/build-android.sh b/native_extension/ane/build-android.sh deleted file mode 100644 index feaba72..0000000 --- a/native_extension/ane/build-android.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -#Get the path to the script and trim to get the directory. -echo "Setting path to current directory to:" -pathtome=$0 -pathtome="${pathtome%/*}" -AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_32" - -PROJECTNAME=VibrationANE - -#Copy SWC into place. -echo "Copying SWC into place." -cp "$pathtome/../bin/$PROJECTNAME.swc" "$pathtome/" - -#Extract contents of SWC. -echo "Extracting files form SWC." -unzip "$pathtome/$PROJECTNAME.swc" "library.swf" -d "$pathtome" - -#Copy library.swf to folders. -echo "Copying library.swf into place." -cp "$pathtome/library.swf" "$pathtome/platforms/android" - -echo "Copying Android aars into place" -cp "$pathtome/../../native_library/android/$PROJECTNAME/app/build/outputs/aar/app-release.aar" "$pathtome/platforms/android/app-release.aar" -echo "getting Android jars" -unzip "$pathtome/platforms/android/app-release.aar" "classes.jar" -d "$pathtome/platforms/android" -unzip "$pathtome/platforms/android/app-release.aar" "res/*" -d "$pathtome/platforms/android" -mv "$pathtome/platforms/android/res" "$pathtome/platforms/android/com.tuarua.$PROJECTNAME-res" - -#Run the build command. -echo "Building ANE." -"$AIR_SDK"/bin/adt -package \ --target ane "$pathtome/$PROJECTNAME.ane" "$pathtome/extension_android.xml" \ --swc "$pathtome/$PROJECTNAME.swc" \ --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/. \ --platformoptions "$pathtome/platforms/android/platform.xml" \ - -rm "$pathtome/platforms/android/classes.jar" -rm "$pathtome/platforms/android/app-release.aar" -rm "$pathtome/platforms/android/library.swf" - -rm "$pathtome/$PROJECTNAME.swc" -rm "$pathtome/library.swf" -rm -r "$pathtome/platforms/android/com.tuarua.$PROJECTNAME-res" - -echo "DONE!" diff --git a/native_extension/ane/build_ios.sh b/native_extension/ane/build_ios.sh deleted file mode 100755 index 6deb1f2..0000000 --- a/native_extension/ane/build_ios.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/sh - -#Get the path to the script and trim to get the directory. -echo "Setting path to current directory to:" -pathtome=$0 -pathtome="${pathtome%/*}" - - -echo $pathtome - -PROJECTNAME=VibrationANE -fwSuffix="_FW" -libSuffix="_LIB" - -AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_32" -echo $AIR_SDK - -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 -echo "No Device build. Build using Xcode" -exit -fi - -#Setup the directory. -echo "Making directories." - -if [ ! -d "$pathtome/platforms" ]; then -mkdir "$pathtome/platforms" -fi -if [ ! -d "$pathtome/platforms/ios" ]; then -mkdir "$pathtome/platforms/ios" -fi -if [ ! -d "$pathtome/platforms/ios/simulator" ]; then -mkdir "$pathtome/platforms/ios/simulator" -fi -if [ ! -d "$pathtome/platforms/ios/simulator/Frameworks" ]; then -mkdir "$pathtome/platforms/ios/simulator/Frameworks" -fi -if [ ! -d "$pathtome/platforms/ios/device" ]; then -mkdir "$pathtome/platforms/ios/device" -fi -if [ ! -d "$pathtome/platforms/ios/device/Frameworks" ]; then -mkdir "$pathtome/platforms/ios/device/Frameworks" -fi -if [ ! -d "$pathtome/platforms/ios/default" ]; then -mkdir "$pathtome/platforms/ios/default" -fi - - -#Copy SWC into place. -echo "Copying SWC into place." -cp "$pathtome/../bin/$PROJECTNAME.swc" "$pathtome/" - -#Extract contents of SWC. -echo "Extracting files form SWC." -unzip "$pathtome/$PROJECTNAME.swc" "library.swf" -d "$pathtome" - -#Copy library.swf to folders. -echo "Copying library.swf into place." -cp "$pathtome/library.swf" "$pathtome/platforms/ios/simulator" -cp "$pathtome/library.swf" "$pathtome/platforms/ios/device" -cp "$pathtome/library.swf" "$pathtome/platforms/ios/default" - -#Copy native libraries into place. -echo "Copying native libraries into place." -cp -R -L "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphonesimulator/lib$PROJECTNAME$libSuffix.a" "$pathtome/platforms/ios/simulator/lib$PROJECTNAME.a" -cp -R -L "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphoneos/lib$PROJECTNAME$libSuffix.a" "$pathtome/platforms/ios/device/lib$PROJECTNAME.a" - - -cp -R -L "$pathtome/../../example/ios_dependencies/simulator/Frameworks/FreSwift.framework" "$pathtome/platforms/ios/simulator/Frameworks" -cp -R -L "$pathtome/../../example/ios_dependencies/device/Frameworks/FreSwift.framework" "$pathtome/platforms/ios/device/Frameworks" - - -cp -R -L "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphonesimulator/$PROJECTNAME$fwSuffix.framework" "$pathtome/platforms/ios/simulator/Frameworks" -cp -R -L "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphoneos/$PROJECTNAME$fwSuffix.framework" "$pathtome/platforms/ios/device/Frameworks" - - -#move the swift dylibs into root of "$pathtome/platforms/ios/ios_dependencies/Frameworks" as per Adobe docs for AIR27 - -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/*" -do -mv -f $dylib "$pathtome/../../example/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" ] -then -for dylib in "$pathtome/platforms/ios/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks/*" -do -mv -f $dylib "$pathtome/../../example/ios_dependencies/simulator/Frameworks" -done -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/ios_dependencies/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" ]; then -rm "$pathtome/../../example/ios_dependencies/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" -fi -if [ -f "$pathtome/../../example/ios_dependencies/device/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" ]; then -rm "$pathtome/../../example/ios_dependencies/device/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" -fi -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 -rm "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/libswiftRemoteMirror.dylib" -fi - -cp -R -L "$pathtome/platforms/ios/simulator/Frameworks/$PROJECTNAME$fwSuffix.framework" "$pathtome/../../example/ios_dependencies/simulator/Frameworks" -cp -R -L "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework" "$pathtome/../../example/ios_dependencies/device/Frameworks" - - -#Run the build command. -echo "Building ANE." -"$AIR_SDK"/bin/adt -package \ --target ane "$pathtome/$PROJECTNAME.ane" "$pathtome/extension_ios.xml" \ --swc "$pathtome/$PROJECTNAME.swc" \ --platform iPhone-x86 -C "$pathtome/platforms/ios/simulator" "library.swf" "Frameworks" "lib$PROJECTNAME.a" \ --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" \ - -#remove the frameworks from sim and device, as not needed any more -rm -r "$pathtome/platforms/ios/simulator" -rm -r "$pathtome/platforms/ios/device" -rm -r "$pathtome/platforms/ios/default" -rm "$pathtome/$PROJECTNAME.swc" -rm "$pathtome/library.swf" -echo "Finished." diff --git a/native_extension/ane/build_mobile.sh b/native_extension/ane/build_mobile.sh index 4dec327..4a3cd80 100755 --- a/native_extension/ane/build_mobile.sh +++ b/native_extension/ane/build_mobile.sh @@ -5,15 +5,11 @@ echo "Setting path to current directory to:" pathtome=$0 pathtome="${pathtome%/*}" - -echo $pathtome - PROJECTNAME=VibrationANE fwSuffix="_FW" libSuffix="_LIB" -AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_32" -echo $AIR_SDK +AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33" if [ ! -d "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphonesimulator/" ]; then echo "No Simulator build. Build using Xcode" @@ -71,24 +67,21 @@ echo "Copying native libraries into place." cp -R -L "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphonesimulator/lib$PROJECTNAME$libSuffix.a" "$pathtome/platforms/ios/simulator/lib$PROJECTNAME.a" cp -R -L "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphoneos/lib$PROJECTNAME$libSuffix.a" "$pathtome/platforms/ios/device/lib$PROJECTNAME.a" - cp -R -L "$pathtome/../../example/ios_dependencies/simulator/Frameworks/FreSwift.framework" "$pathtome/platforms/ios/simulator/Frameworks" cp -R -L "$pathtome/../../example/ios_dependencies/device/Frameworks/FreSwift.framework" "$pathtome/platforms/ios/device/Frameworks" - cp -R -L "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphonesimulator/$PROJECTNAME$fwSuffix.framework" "$pathtome/platforms/ios/simulator/Frameworks" cp -R -L "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphoneos/$PROJECTNAME$fwSuffix.framework" "$pathtome/platforms/ios/device/Frameworks" - #move the swift dylibs into root of "$pathtome/platforms/ios/ios_dependencies/Frameworks" as per Adobe docs for AIR27 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/ios_dependencies/device/Frameworks" +mv -f "$dylib" "$pathtome/../../example/ios_dependencies/device/Frameworks" done rm -r "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks" fi @@ -97,9 +90,9 @@ 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/ios_dependencies/simulator/Frameworks" +mv -f "$dylib" "$pathtome/../../example/ios_dependencies/simulator/Frameworks" done if [ -d "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks" ]; then rm -r "$pathtome/platforms/ios/device/Frameworks/$PROJECTNAME$fwSuffix.framework/Frameworks" @@ -140,7 +133,7 @@ echo "Building ANE." -C "$pathtome/platforms/android" "library.swf" "classes.jar" \ com.tuarua.$PROJECTNAME-res/. \ -platformoptions "$pathtome/platforms/android/platform.xml" \ --platform Android-x86 \ +-platform Android-ARM64 \ -C "$pathtome/platforms/android" "library.swf" "classes.jar" \ com.tuarua.$PROJECTNAME-res/. \ -platformoptions "$pathtome/platforms/android/platform.xml" \ diff --git a/native_extension/ane/extension_android.xml b/native_extension/ane/extension_android.xml deleted file mode 100644 index 2d8f9c8..0000000 --- a/native_extension/ane/extension_android.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - com.tuarua.VibrationANE - Vibration ANE - This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd. - 1.1.0 - - - - classes.jar - com.tuarua.VibrationANE - com.tuarua.VibrationANE - - - - - classes.jar - com.tuarua.VibrationANE - com.tuarua.VibrationANE - - - - diff --git a/native_extension/ane/extension_ios.xml b/native_extension/ane/extension_ios.xml deleted file mode 100644 index 8dc0bcb..0000000 --- a/native_extension/ane/extension_ios.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - com.tuarua.VibrationANE - Vibration ANE - This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd. - 1.1.0 - - - - libVibrationANE.a - TRVIBExtInizer - TRVIBExtFinizer - - - - - libVibrationANE.a - TRVIBExtInizer - TRVIBExtFinizer - - - - diff --git a/native_extension/ane/extension_mobile.xml b/native_extension/ane/extension_mobile.xml index bc6003f..fc71d78 100644 --- a/native_extension/ane/extension_mobile.xml +++ b/native_extension/ane/extension_mobile.xml @@ -3,7 +3,7 @@ com.tuarua.VibrationANE Vibration ANE This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd. - 1.1.0 + 1.2.0 @@ -12,7 +12,7 @@ com.tuarua.VibrationANE - + classes.jar com.tuarua.VibrationANE diff --git a/native_library/android/VibrationANE/.idea/codeStyles/Project.xml b/native_library/android/VibrationANE/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/native_library/android/VibrationANE/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/native_library/android/VibrationANE/.idea/misc.xml b/native_library/android/VibrationANE/.idea/misc.xml index 51fa3e5..cc04cd3 100644 --- a/native_library/android/VibrationANE/.idea/misc.xml +++ b/native_library/android/VibrationANE/.idea/misc.xml @@ -35,7 +35,7 @@ - + diff --git a/native_library/android/VibrationANE/VibrationANE.iml b/native_library/android/VibrationANE/VibrationANE.iml index e470175..2668536 100644 --- a/native_library/android/VibrationANE/VibrationANE.iml +++ b/native_library/android/VibrationANE/VibrationANE.iml @@ -8,7 +8,7 @@ - + diff --git a/native_library/android/VibrationANE/app/app.iml b/native_library/android/VibrationANE/app/app.iml index fcf2f4b..c47c25c 100644 --- a/native_library/android/VibrationANE/app/app.iml +++ b/native_library/android/VibrationANE/app/app.iml @@ -17,22 +17,23 @@ - - - + + + - + - + - + - + @@ -116,18 +124,33 @@ + + + + + + + + + + + + + + + @@ -136,6 +159,7 @@ + @@ -143,12 +167,12 @@ - + - - - - + + + + \ 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 febab93..49b50a5 100644 --- a/native_library/android/VibrationANE/app/build.gradle +++ b/native_library/android/VibrationANE/app/build.gradle @@ -3,13 +3,13 @@ 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.1.0" + versionName "1.2.0" } buildTypes { release { @@ -17,9 +17,14 @@ 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.tuarua:FreKotlin:$frekotlin_version" } repositories { diff --git a/native_library/android/VibrationANE/build.gradle b/native_library/android/VibrationANE/build.gradle index 590915b..e61cbb1 100644 --- a/native_library/android/VibrationANE/build.gradle +++ b/native_library/android/VibrationANE/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.30' - ext.frekotlin_version = '1.7.0' + ext.kotlin_version = '1.3.40' + ext.frekotlin_version = '1.8.0-beta1' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.4.1' 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/VibrationANE/gradle/wrapper/gradle-wrapper.properties b/native_library/android/VibrationANE/gradle/wrapper/gradle-wrapper.properties index e8fed7e..36f83c3 100644 --- a/native_library/android/VibrationANE/gradle/wrapper/gradle-wrapper.properties +++ b/native_library/android/VibrationANE/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 27 23:04:41 GMT 2017 +#Fri Jun 28 00:58:29 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