Skip to content

Commit

Permalink
Merge pull request #48 from tuarua/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
tuarua authored Nov 14, 2020
2 parents 2a72b79 + 6f6bd7c commit 6f5124d
Show file tree
Hide file tree
Showing 157 changed files with 3,538 additions and 4,434 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### 0.15.0
- AND: Updated to FreKotlin 1.41.0
- iOS: Updated to FreSwift 5.0.0
- Upgraded to AIR 33.1.1.300

### 0.14.0
- New system for installing ANEs `./air-tools install` via air_package.json file
- New system for installing ANEs `./air-tools apply-firebase-config google-services.json`
Expand Down
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.

10 changes: 5 additions & 5 deletions example/FirebaseANESample-mobile.iml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="Flex" version="4">
<component name="FlexBuildConfigurationManager" active="Android Device">
<component name="FlexBuildConfigurationManager" active="iOS Device">
<configurations>
<configuration name="Android Device" target-platform="Mobile" pure-as="true" main-class="Main" output-file="Main.swf" output-folder="$MODULE_DIR$/bin-release">
<dependencies>
Expand All @@ -12,7 +12,7 @@
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="AIRSDK_33.1.1.217" />
<sdk name="AIRSDK_33.1.1.300" />
</dependencies>
<compiler-options>
<map>
Expand Down Expand Up @@ -44,7 +44,7 @@
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="AIRSDK_33.1.1.217" />
<sdk name="AIRSDK_33.1.1.300" />
</dependencies>
<compiler-options>
<map>
Expand Down Expand Up @@ -85,7 +85,7 @@
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="AIRSDK_33.1.1.217" />
<sdk name="AIRSDK_33.1.1.300" />
</dependencies>
<compiler-options>
<map>
Expand Down Expand Up @@ -123,7 +123,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="AIRSDK_33.1.1.217" 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="ZipANE" level="project" />
Expand Down
26 changes: 13 additions & 13 deletions example/air_package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "firebase-sample",
"version": "0.14.0",
"version": "0.15.0",
"appDescriptor": "src/Main-app.xml",
"variables": {
"firebase_associated_domain": "xxxx.app.goo.gl",
Expand All @@ -15,17 +15,17 @@
"url": "https://tuarua.github.io/air/air_packages.json"
},
"dependencies": {
"com.tuarua.firebase.FirebaseANE": "0.14.0",
"com.tuarua.firebase.AnalyticsANE": "0.14.0",
"com.tuarua.firebase.AuthANE": "0.14.0",
"com.tuarua.firebase.DynamicLinksANE": "0.14.0",
"com.tuarua.firebase.FirestoreANE": "0.14.0",
"com.tuarua.firebase.MessagingANE": "0.14.0",
"com.tuarua.firebase.PerformanceANE": "0.14.0",
"com.tuarua.firebase.RemoteConfigANE": "0.14.0",
"com.tuarua.firebase.StorageANE": "0.14.0",
"com.tuarua.firebase.CrashlyticsANE": "0.14.0",
"com.tuarua.google.GoogleSignInANE": "0.14.0",
"com.tuarua.OneSignalANE": "0.14.0"
"com.tuarua.firebase.FirebaseANE": "0.15.0",
"com.tuarua.firebase.AnalyticsANE": "0.15.0",
"com.tuarua.firebase.AuthANE": "0.15.0",
"com.tuarua.firebase.DynamicLinksANE": "0.15.0",
"com.tuarua.firebase.FirestoreANE": "0.15.0",
"com.tuarua.firebase.MessagingANE": "0.15.0",
"com.tuarua.firebase.PerformanceANE": "0.15.0",
"com.tuarua.firebase.RemoteConfigANE": "0.15.0",
"com.tuarua.firebase.StorageANE": "0.15.0",
"com.tuarua.firebase.CrashlyticsANE": "0.15.0",
"com.tuarua.google.GoogleSignInANE": "0.15.0",
"com.tuarua.OneSignalANE": "0.15.0"
}
}
File renamed without changes.
1 change: 1 addition & 0 deletions example/res/values/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
values.xml
8 changes: 4 additions & 4 deletions example/src/Main-app.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<application xmlns="http://ns.adobe.com/air/application/33.1">
<id>com.tuarua.firebaseane.example</id>
<filename>FireBaseExample</filename>
<name>FIR-Example</name>
<versionNumber>0.14.0</versionNumber>
<versionNumber>0.15.0</versionNumber>
<!-- Settings for the application's initial window. Required. -->
<initialWindow>
<content>[This value will be overwritten by Flash Builder in the output app.xml]</content>
Expand Down Expand Up @@ -62,7 +62,7 @@
</extensions>
<android>
<manifestAdditions><![CDATA[<manifest android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
Expand Down Expand Up @@ -256,4 +256,4 @@
</array>
]]></Entitlements>
</iPhone>
</application>
</application>
2 changes: 1 addition & 1 deletion example_vision/.idea/misc.xml

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

6 changes: 3 additions & 3 deletions example_vision/VisionANESample.iml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="AIRSDK_33.1.1.217" />
<sdk name="AIRSDK_33.1.1.300" />
</dependencies>
<compiler-options>
<option name="additionalOptions" value="-advanced-telemetry -swf-version=42" />
Expand Down Expand Up @@ -40,7 +40,7 @@
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="AIRSDK_33.1.1.217" />
<sdk name="AIRSDK_33.1.1.300" />
</dependencies>
<compiler-options>
<option name="additionalOptions" value="-advanced-telemetry" />
Expand All @@ -67,7 +67,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="AIRSDK_33.1.1.217" 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="FirebaseANE" level="project" />
Expand Down
18 changes: 9 additions & 9 deletions example_vision/air_package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "firebase-sample",
"version": "0.14.0",
"version": "0.15.0",
"appDescriptor": "src/Main-app.xml",
"variables": {},
"airDotPrefix": true,
Expand All @@ -9,13 +9,13 @@
"url": "https://tuarua.github.io/air/air_packages.json"
},
"dependencies": {
"com.tuarua.firebase.FirebaseANE": "0.14.0",
"com.tuarua.firebase.AnalyticsANE": "0.14.0",
"com.tuarua.firebase.VisionANE": "0.14.0",
"com.tuarua.firebase.VisionCloudTextANE": "0.14.0",
"com.tuarua.firebase.VisionCloudDocumentANE": "0.14.0",
"com.tuarua.firebase.VisionCloudLabelANE": "0.14.0",
"com.tuarua.firebase.VisionLandmarkANE": "0.14.0",
"com.tuarua.firebase.ModelInterpreterANE": "0.14.0"
"com.tuarua.firebase.FirebaseANE": "0.15.0",
"com.tuarua.firebase.AnalyticsANE": "0.15.0",
"com.tuarua.firebase.VisionANE": "0.15.0",
"com.tuarua.firebase.VisionCloudTextANE": "0.15.0",
"com.tuarua.firebase.VisionCloudDocumentANE": "0.15.0",
"com.tuarua.firebase.VisionCloudLabelANE": "0.15.0",
"com.tuarua.firebase.VisionLandmarkANE": "0.15.0",
"com.tuarua.firebase.ModelInterpreterANE": "0.15.0"
}
}
6 changes: 3 additions & 3 deletions example_vision/src/Main-app.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<application xmlns="http://ns.adobe.com/air/application/33.1">
<id>com.tuarua.firebaseane.example</id>
<filename>FireBaseExample</filename>
<name>FIR-Example</name>
<versionNumber>0.14.0</versionNumber>
<versionNumber>0.15.0</versionNumber>
<!-- Settings for the application's initial window. Required. -->
<initialWindow>
<content>[This value will be overwritten by Flash Builder in the output app.xml]</content>
Expand Down Expand Up @@ -108,4 +108,4 @@
</array>
]]></InfoAdditions>
</iPhone>
</application>
</application>
2 changes: 1 addition & 1 deletion native_extension/AnalyticsANE/ane/air_package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.tuarua.firebase.AnalyticsANE",
"version": "0.14.0",
"version": "0.15.0",
"repository": {
"url": "https://tuarua.github.io/air/air_packages.json"
},
Expand Down
2 changes: 1 addition & 1 deletion native_extension/AnalyticsANE/ane/build_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pathtome="${pathtome%/*}"
PROJECTNAME=AnalyticsANE
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/FirebaseANE/Build/Products/Release-iphonesimulator/" ]]; then
echo "No Simulator build. Build using Xcode"
Expand Down
2 changes: 1 addition & 1 deletion native_extension/AnalyticsANE/ane/extension_multi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<id>com.tuarua.firebase.AnalyticsANE</id>
<name>Firebase Analytics ANE</name>
<copyright>This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd.</copyright>
<versionNumber>0.14.0</versionNumber>
<versionNumber>0.15.0</versionNumber>
<platforms>
<platform name="iPhone-ARM">
<applicationDeployment>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<platform xmlns="http://ns.adobe.com/air/extension/19.0">
<sdkVersion>13.0</sdkVersion>
<sdkVersion>14.1</sdkVersion>
<linkerOptions>
<option>-ios_version_min 9.0</option>
<option>-w</option>
Expand Down
2 changes: 1 addition & 1 deletion native_extension/AuthANE/ane/air_package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.tuarua.firebase.AuthANE",
"version": "0.14.0",
"version": "0.15.0",
"repository": {
"url": "https://tuarua.github.io/air/air_packages.json"
},
Expand Down
2 changes: 1 addition & 1 deletion native_extension/AuthANE/ane/build_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pathtome="${pathtome%/*}"
PROJECTNAME=AuthANE
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/FirebaseANE/Build/Products/Release-iphonesimulator/" ]; then
echo "No Simulator build. Build using Xcode"
Expand Down
2 changes: 1 addition & 1 deletion native_extension/AuthANE/ane/extension_multi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<id>com.tuarua.firebase.AuthANE</id>
<name>Firebase Auth ANE</name>
<copyright>This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd.</copyright>
<versionNumber>0.14.0</versionNumber>
<versionNumber>0.15.0</versionNumber>
<platforms>
<platform name="iPhone-ARM">
<applicationDeployment>
Expand Down
2 changes: 1 addition & 1 deletion native_extension/AuthANE/ane/platforms/ios/platform.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<platform xmlns="http://ns.adobe.com/air/extension/19.0">
<sdkVersion>13.0</sdkVersion>
<sdkVersion>14.1</sdkVersion>
<linkerOptions>
<option>-ios_version_min 9.0</option>
<option>-w</option>
Expand Down
2 changes: 1 addition & 1 deletion native_extension/CrashlyticsANE/ane/air_package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.tuarua.firebase.CrashlyticsANE",
"version": "0.14.0",
"version": "0.15.0",
"repository": {
"url": "https://tuarua.github.io/air/air_packages.json"
},
Expand Down
2 changes: 1 addition & 1 deletion native_extension/CrashlyticsANE/ane/build_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pathtome="${pathtome%/*}"
PROJECTNAME=CrashlyticsANE
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/FirebaseANE/Build/Products/Release-iphonesimulator/" ]]; then
echo "No Simulator build. Build using Xcode"
Expand Down
2 changes: 1 addition & 1 deletion native_extension/CrashlyticsANE/ane/extension_multi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<id>com.tuarua.firebase.CrashlyticsANE</id>
<name>Firebase Crashlytics ANE</name>
<copyright>This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd.</copyright>
<versionNumber>0.14.0</versionNumber>
<versionNumber>0.15.0</versionNumber>
<platforms>
<platform name="iPhone-ARM">
<applicationDeployment>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<platform xmlns="http://ns.adobe.com/air/extension/19.0">
<sdkVersion>13.0</sdkVersion>
<sdkVersion>14.1</sdkVersion>
<linkerOptions>
<option>-ios_version_min 9.0</option>
<option>-lsqlite3</option>
Expand Down
2 changes: 1 addition & 1 deletion native_extension/DynamicLinksANE/ane/air_package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.tuarua.firebase.DynamicLinksANE",
"version": "0.14.0",
"version": "0.15.0",
"repository": {
"url": "https://tuarua.github.io/air/air_packages.json"
},
Expand Down
2 changes: 1 addition & 1 deletion native_extension/DynamicLinksANE/ane/build_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pathtome="${pathtome%/*}"
PROJECTNAME=DynamicLinksANE
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/FirebaseANE/Build/Products/Release-iphonesimulator/" ]; then
echo "No Simulator build. Build using Xcode"
Expand Down
2 changes: 1 addition & 1 deletion native_extension/DynamicLinksANE/ane/extension_multi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<id>com.tuarua.firebase.DynamicLinksANE</id>
<name>Firebase Dynamic Links ANE</name>
<copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
<versionNumber>0.14.0</versionNumber>
<versionNumber>0.15.0</versionNumber>
<platforms>
<platform name="iPhone-ARM">
<applicationDeployment>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<platform xmlns="http://ns.adobe.com/air/extension/19.0">
<sdkVersion>13.0</sdkVersion>
<sdkVersion>14.1</sdkVersion>
<linkerOptions>
<option>-ios_version_min 9.0</option>
<option>-lsqlite3</option>
Expand Down
2 changes: 1 addition & 1 deletion native_extension/FirestoreANE/ane/air_package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.tuarua.firebase.FirestoreANE",
"version": "0.14.0",
"version": "0.15.0",
"repository": {
"url": "https://tuarua.github.io/air/air_packages.json"
},
Expand Down
2 changes: 1 addition & 1 deletion native_extension/FirestoreANE/ane/build_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pathtome="${pathtome%/*}"
PROJECTNAME=FirestoreANE
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/FirebaseANE/Build/Products/Release-iphonesimulator/" ]; then
echo "No Simulator build. Build using Xcode"
Expand Down
2 changes: 1 addition & 1 deletion native_extension/FirestoreANE/ane/extension_multi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<id>com.tuarua.firebase.FirestoreANE</id>
<name>Firebase Firestore ANE</name>
<copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
<versionNumber>0.14.0</versionNumber>
<versionNumber>0.15.0</versionNumber>
<platforms>
<platform name="iPhone-ARM">
<applicationDeployment>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<platform xmlns="http://ns.adobe.com/air/extension/19.0">
<sdkVersion>13.0</sdkVersion>
<sdkVersion>14.1</sdkVersion>
<linkerOptions>
<option>-ios_version_min 9.0</option>
<option>-lsqlite3</option>
Expand Down
2 changes: 1 addition & 1 deletion native_extension/GoogleSignInANE/ane/air_package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.tuarua.google.GoogleSignInANE",
"version": "0.14.0",
"version": "0.15.0",
"repository": {
"url": "https://tuarua.github.io/air/air_packages.json"
},
Expand Down
Loading

0 comments on commit 6f5124d

Please sign in to comment.