Skip to content

Commit 8c01d35

Browse files
rozdrozd
committed
Adds Android 64bit support
Bumped version to 1.1.0
1 parent 1c431cd commit 8c01d35

10 files changed

Lines changed: 53 additions & 45 deletions

File tree

‎build/build.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
<arg line="-swc swc/default/${project.name}.swc"/>
217217
<arg line="-platform iPhone-ARM -platformoptions ../platform-ios.xml -C ios/ ."/>
218218
<arg line="-platform iPhone-x86 -platformoptions ../platform-ios.xml -C ios-simulator/ ."/>
219+
<arg line="-platform Android-ARM64 -platformoptions ../platform-android.xml -C android/ ."/>
219220
<arg line="-platform Android-ARM -platformoptions ../platform-android.xml -C android/ ."/>
220221
<arg line="-platform Android-x86 -platformoptions ../platform-android.xml -C android/ ."/>
221222
<arg line="-platform default -C default/ ."/>

‎build/extension.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<extension xmlns="http://ns.adobe.com/air/extension/24.0">
22
<id>com.github.airext.Documents</id>
3-
<versionNumber>1.0.9</versionNumber>
3+
<versionNumber>1.1.0</versionNumber>
44
<platforms>
55
<platform name="iPhone-ARM">
66
<applicationDeployment>
@@ -16,6 +16,13 @@
1616
<finalizer>ANXDocumentsFinalizer</finalizer>
1717
</applicationDeployment>
1818
</platform>
19+
<platform name="Android-ARM64">
20+
<applicationDeployment>
21+
<nativeLibrary>libANXDocuments.jar</nativeLibrary>
22+
<initializer>com.github.airext.Documents</initializer>
23+
<finalizer>com.github.airext.Documents</finalizer>
24+
</applicationDeployment>
25+
</platform>
1926
<platform name="Android-ARM">
2027
<applicationDeployment>
2128
<nativeLibrary>libANXDocuments.jar</nativeLibrary>

‎documents-air/.idea/workspace.xml‎

Lines changed: 21 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎documents-air/documents-debug/ane/com.distriqt.androidsupport.V4.ane‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:9b50f6c11ce4a0011a9ece0374eb7c6f3361d9e97b44978fe62cab7fb404b19a
3-
size 2914017
2+
oid sha256:80768728ff6be29d071917b657e7a2fc8ec1a71b91a378242b2b1fa1bc781f77
3+
size 4343913

‎documents-air/documents-debug/ane/com.github.airext.Documents.ane‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:1030156cd4f0fd6c0083be07810574331e4a0b6a6477a8e1619186c3ae243452
3-
size 93458
2+
oid sha256:99c6112be8db79f9dd4b26cf386a265d06b5fa274d06aca76be434913d11c6b8
3+
size 102225

‎documents-air/documents-debug/ane/com.github.airext.Documents.swc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:808d3486aa236b905028731a1d084bf41bc2688b0fc4ddb39361d8f66eb1fe93
2+
oid sha256:9fe43e0719e2d32dd3b7b2bb19416a8fe04599984ec96c6cb697981551bdc80b
33
size 2171

‎documents-air/documents-debug/documents-debug.iml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,25 @@
55
<configuration name="documents-debug" target-platform="Mobile" main-class="DocumentsDebug" output-file="DocumentsDebug.swf" output-folder="$MODULE_DIR$/bin">
66
<dependencies target-player="29.0">
77
<entries>
8-
<entry library-id="0f49ee96-7efc-443b-9a85-874a02183b12">
8+
<entry library-id="6c8aa2f7-71f8-40e6-a76f-be94a50a9e25">
99
<dependency linkage="Merged" />
1010
</entry>
11-
<entry library-id="74917fb0-0ff2-4c1f-b733-4850989bffb6">
11+
<entry library-id="30d9edac-4ce8-43d3-a44d-36b2b7612bef">
1212
<dependency linkage="Merged" />
1313
</entry>
14-
<entry library-id="6c8aa2f7-71f8-40e6-a76f-be94a50a9e25">
14+
<entry library-id="04631556-6366-4873-b921-0fd28b1dd7b1">
1515
<dependency linkage="Merged" />
1616
</entry>
1717
</entries>
18-
<sdk name="3.5.x" />
18+
<sdk name="4.0.0-air33.0-starling2.5.1" />
1919
</dependencies>
2020
<compiler-options />
2121
<packaging-air-desktop />
2222
<packaging-android enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/DocumentsDebug-app.xml" package-file-name="DocumentsDebug">
2323
<files-to-package>
2424
<FilePathAndPathInPackage file-path="$MODULE_DIR$/src/assets" path-in-package="." />
2525
</files-to-package>
26+
<AirSigningOptions arch="armv8" />
2627
</packaging-android>
2728
<packaging-ios enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/DocumentsDebug-app.xml" package-file-name="DocumentsDebug">
2829
<files-to-package>
@@ -41,39 +42,39 @@
4142
<sourceFolder url="file://$MODULE_DIR$/src/assets" isTestSource="false" />
4243
<sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
4344
</content>
44-
<orderEntry type="jdk" jdkName="3.5.x" jdkType="Flex SDK Type (new)" />
45+
<orderEntry type="jdk" jdkName="4.0.0-air33.0-starling2.5.1" jdkType="Flex SDK Type (new)" />
4546
<orderEntry type="sourceFolder" forTests="false" />
4647
<orderEntry type="module-library" exported="">
4748
<library type="flex">
48-
<properties id="0f49ee96-7efc-443b-9a85-874a02183b12" />
49+
<properties id="6c8aa2f7-71f8-40e6-a76f-be94a50a9e25" />
4950
<CLASSES>
50-
<root url="file://$USER_HOME$/sdks/feathers/3.5.0-beta/frameworks/libs" />
51+
<root url="file://$MODULE_DIR$/ane" />
5152
</CLASSES>
5253
<JAVADOC />
5354
<SOURCES />
54-
<jarDirectory url="file://$USER_HOME$/sdks/feathers/3.5.0-beta/frameworks/libs" recursive="false" />
55+
<jarDirectory url="file://$MODULE_DIR$/ane" recursive="false" />
5556
</library>
5657
</orderEntry>
5758
<orderEntry type="module-library" exported="">
5859
<library type="flex">
59-
<properties id="74917fb0-0ff2-4c1f-b733-4850989bffb6" />
60+
<properties id="30d9edac-4ce8-43d3-a44d-36b2b7612bef" />
6061
<CLASSES>
61-
<root url="file://$USER_HOME$/sdks/feathers/3.5.0-beta/frameworks/themes/MetalWorksMobileTheme" />
62+
<root url="file://$USER_HOME$/sdks/feathers/4.0.0-air33.0-starling2.5.1/frameworks/libs" />
6263
</CLASSES>
6364
<JAVADOC />
6465
<SOURCES />
65-
<jarDirectory url="file://$USER_HOME$/sdks/feathers/3.5.0-beta/frameworks/themes/MetalWorksMobileTheme" recursive="false" />
66+
<jarDirectory url="file://$USER_HOME$/sdks/feathers/4.0.0-air33.0-starling2.5.1/frameworks/libs" recursive="false" />
6667
</library>
6768
</orderEntry>
6869
<orderEntry type="module-library" exported="">
6970
<library type="flex">
70-
<properties id="6c8aa2f7-71f8-40e6-a76f-be94a50a9e25" />
71+
<properties id="04631556-6366-4873-b921-0fd28b1dd7b1" />
7172
<CLASSES>
72-
<root url="file://$MODULE_DIR$/ane" />
73+
<root url="file://$USER_HOME$/sdks/feathers/4.0.0-air33.0-starling2.5.1/frameworks/themes/MetalWorksMobileTheme" />
7374
</CLASSES>
7475
<JAVADOC />
7576
<SOURCES />
76-
<jarDirectory url="file://$MODULE_DIR$/ane" recursive="false" />
77+
<jarDirectory url="file://$USER_HOME$/sdks/feathers/4.0.0-air33.0-starling2.5.1/frameworks/themes/MetalWorksMobileTheme" recursive="false" />
7778
</library>
7879
</orderEntry>
7980
</component>

‎documents-air/documents/documents.iml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<configurations>
55
<configuration name="documents" target-platform="Mobile" pure-as="true" output-type="Library" output-file="documents.swc" output-folder="$MODULE_DIR$/../out/production/documents">
66
<dependencies target-player="29.0">
7-
<sdk name="29.0.0" />
7+
<sdk name="33.0" />
88
</dependencies>
99
<compiler-options />
1010
<packaging-air-desktop />
@@ -20,7 +20,7 @@
2020
<sourceFolder url="file://$MODULE_DIR$/src/default" isTestSource="false" />
2121
<sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
2222
</content>
23-
<orderEntry type="jdk" jdkName="29.0.0" jdkType="Flex SDK Type (new)" />
23+
<orderEntry type="jdk" jdkName="33.0" jdkType="Flex SDK Type (new)" />
2424
<orderEntry type="sourceFolder" forTests="false" />
2525
</component>
2626
</module>

‎documents-ios/Documents/Documents.xcodeproj/project.xcworkspace/xcuserdata/max.xcuserdatad/UserInterfaceState.xcuserstate‎

20.8 KB
Binary file not shown.

‎documents-ios/Documents/Documents/ANXDocumentsConversionRoutines.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ +(FREObject) convertNSStringToFREObject:(NSString*) string
2121
unsigned long length = strlen( utf8String );
2222

2323
FREObject converted;
24-
FREResult result = FRENewObjectFromUTF8((uint32_t) length + 1, (const uint8_t*) utf8String, &converted);
24+
FREResult result = FRENewObjectFromUTF8((uint32_t) length, (const uint8_t*) utf8String, &converted);
2525

2626
if (result != FRE_OK)
2727
return NULL;

0 commit comments

Comments
 (0)