Skip to content

Commit

Permalink
1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tuarua committed Jun 30, 2019
1 parent c3993ce commit 3f8c38a
Show file tree
Hide file tree
Showing 25 changed files with 112 additions and 390 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion example/.actionScriptProperties
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</libraryPathEntry>
<libraryPathEntry kind="3" linkType="1" path="libs/starling.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="5" linkType="2" path="${DOCUMENTS}/Vibration-ANE/native_extension/ane/VibrationANE.ane"/>
<libraryPathEntry kind="5" linkType="2" path="android_dependencies/com.tuarua.frekotlin.ane"/>
<libraryPathEntry kind="5" linkType="2" path="android_dependencies/com.tuarua.frekotlin-1.8.0.ane"/>
</libraryPath>
<sourceAttachmentPath/>
</compiler>
Expand All @@ -55,6 +55,7 @@
<airExcludes/>
<anePaths>
<anePathEntry path="${DOCUMENTS}/Vibration-ANE/native_extension/ane/VibrationANE.ane"/>
<anePathEntry path="${DOCUMENTS}/Vibration-ANE/native_extension/ane/com.tuarua.frekotlin-1.8.0.ane"/>
</anePaths>
</airSettings>
<multiPlatformSettings enabled="true" hideAneLibSymbols="0" includePlatformLibs="false" platformID="com.adobe.flexide.multiplatform.ios.platform" reducedSizePackaging="false" version="1"/>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion example/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions example/.idea/runConfigurations/Android_Device.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 13 additions & 10 deletions example/VibrationANESample.iml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@
<entry library-name="starling" library-level="project">
<dependency linkage="Merged" />
</entry>
<entry library-name="com.tuarua.frekotlin" library-level="project">
<entry library-name="VibrationANE" library-level="project">
<dependency linkage="Merged" />
</entry>
<entry library-name="VibrationANE" library-level="project">
<entry library-name="com.tuarua.frekotlin-1.8.0" library-level="project">
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="AIRSDK_32" />
<sdk name="AIRSDK_33" />
</dependencies>
<compiler-options>
<map>
<entry key="compiler.locale" value="en_US" />
</map>
<option name="additionalOptions" value="-swf-version=44" />
</compiler-options>
<packaging-air-desktop />
<packaging-android enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app.xml" package-file-name="Main">
Expand All @@ -31,6 +32,7 @@
<FilePathAndPathInPackage file-path="$MODULE_DIR$/system/[email protected]" path-in-package="[email protected]" />
<FilePathAndPathInPackage file-path="$MODULE_DIR$/system/[email protected]" path-in-package="[email protected]" />
</files-to-package>
<AirSigningOptions arch="armv8" />
</packaging-android>
<packaging-ios use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/Main-app.xml" package-file-name="Main" />
</configuration>
Expand All @@ -40,14 +42,14 @@
<entry library-name="starling" library-level="project">
<dependency linkage="Merged" />
</entry>
<entry library-name="com.tuarua.frekotlin" library-level="project">
<entry library-name="VibrationANE" library-level="project">
<dependency linkage="Merged" />
</entry>
<entry library-name="VibrationANE" library-level="project">
<entry library-name="com.tuarua.frekotlin-1.8.0" library-level="project">
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="AIRSDK_32" />
<sdk name="AIRSDK_33" />
</dependencies>
<compiler-options>
<map>
Expand All @@ -71,14 +73,14 @@
<entry library-name="starling" library-level="project">
<dependency linkage="Merged" />
</entry>
<entry library-name="com.tuarua.frekotlin" library-level="project">
<entry library-name="VibrationANE" library-level="project">
<dependency linkage="Merged" />
</entry>
<entry library-name="VibrationANE" library-level="project">
<entry library-name="com.tuarua.frekotlin-1.8.0" library-level="project">
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="AIRSDK_32" />
<sdk name="AIRSDK_33" />
</dependencies>
<compiler-options>
<map>
Expand All @@ -104,10 +106,11 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="AIRSDK_32" jdkType="Flex SDK Type (new)" />
<orderEntry type="jdk" jdkName="AIRSDK_33" 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" />
</component>
</module>
7 changes: 5 additions & 2 deletions example/get_android_dependencies.ps1
Original file line number Diff line number Diff line change
@@ -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
8 changes: 6 additions & 2 deletions example/get_android_dependencies.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion example/get_ios_dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

AneVersion="1.1.0"
AneVersion="1.2.0"
FreSwiftVersion="3.1.0"

rm -r ios_dependencies/device
Expand Down
4 changes: 2 additions & 2 deletions example/src/Main-app.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<application xmlns="http://ns.adobe.com/air/application/32.0">
<application xmlns="http://ns.adobe.com/air/application/33.0">

<id>com.tuarua.vibrationanesample</id>
<filename>VibrationANESample</filename>
<name>VibrationANESample</name>
<versionNumber>1.1.0</versionNumber>
<versionNumber>1.2.0</versionNumber>


<initialWindow>
Expand Down
52 changes: 0 additions & 52 deletions native_extension/ane/build-android.bat

This file was deleted.

52 changes: 0 additions & 52 deletions native_extension/ane/build-android.sh

This file was deleted.

Loading

0 comments on commit 3f8c38a

Please sign in to comment.