Skip to content

Commit 560c5b4

Browse files
committed
fix(actionscript): correct event listener not being added correctly which prevented events from being dispatched (resolves #7)
feat(android): add level associated with a MemoryEvent.LOW_MEMORY_WARNING event (resolves #8)
1 parent a8c181e commit 560c5b4

File tree

133 files changed

+1045
-618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+1045
-618
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11

22

3+
###### 2023.09.22 [v4.2.1]
4+
5+
```
6+
fix(actionscript): correct event listener not being added correctly which prevented events from being dispatched (resolves #7)
7+
feat(android): add level associated with a MemoryEvent.LOW_MEMORY_WARNING event (resolves #8)
8+
```
9+
10+
311
###### 2023.02.01 [v4.1.0]
412

513
```

build.xml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project default="all" name="ane.build">
2+
<project default="all" name="ane.build" xmlns:if="ant:if">
33

44
<import file="build_common.xml" />
55
<property file="${common.basedir}/build_config/build.config" description="build properties" />
@@ -26,14 +26,19 @@
2626
//
2727
-->
2828

29+
30+
2931
<target name="version">
32+
<antcall target="version_increment" if:true="${version.autoincrement}" />
3033
<antcall target="version_write" />
3134
</target>
3235

33-
<target name="version_increment" if="${version.autoincrement}">
36+
<target name="version_increment">
3437
<propertyfile file="./build_config/version.config">
3538
<entry key="version_build" type="int" operation="+" value="1" />
3639
</propertyfile>
40+
<var name="version_build" value="" unset="true"/>
41+
<var file="${common.basedir}/build_config/version.config" description="build version properties" />
3742
</target>
3843

3944
<target name="version_write">
@@ -198,11 +203,23 @@ _site
198203

199204
<target name="airpackage">
200205
<iterate target="deploy" directory="package" />
206+
<if>
207+
<available file="package/variants" type="dir"/>
208+
<then>
209+
<iterate target="deploy" directory="package/variants" />
210+
</then>
211+
</if>
201212
</target>
202213

203214

204215
<target name="clean_airpackage">
205216
<iterate target="clean" directory="package" />
217+
<if>
218+
<available file="package/variants" type="dir"/>
219+
<then>
220+
<iterate target="clean" directory="package/variants" />
221+
</then>
222+
</if>
206223
</target>
207224

208225

build/VERSION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
| Extension | Version | Android Lib | iOS Lib |
44
| --- | --- | --- | --- |
5-
| com.distriqt.Memory | 4.1.0 | | |
5+
| com.distriqt.Memory | 4.2.1 | | |

build/com.distriqt.Memory.ane

5.18 KB
Binary file not shown.

build/swc/com.distriqt.Memory.swc

562 Bytes
Binary file not shown.

build_common.xml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@
44

55
<dirname property="common.basedir" file="${ant.file.common}" />
66

7-
<property file="${common.basedir}/../../build_config/version.config" description="grp version properties" />
8-
<property file="${common.basedir}/build_config/version.config" description="build version properties" />
9-
<property file="${common.basedir}/build_config/build.config" description="build properties" />
10-
<property file="${common.basedir}/build_config/global.config" description="global properties" />
11-
12-
<property name="version.grp" value="${version_grp_major}.${version_grp_minor}.${version_grp_build}" />
13-
147
<taskdef resource="net/sf/antcontrib/antlib.xml"/>
158
<target name="bootstrap">
169
<mkdir dir="${user.home}/.ant/lib"/>
@@ -21,6 +14,19 @@
2114
<get dest="${user.home}/.ant/lib/commons-logging-api.jar" src="http://search.maven.org/remotecontent?filepath=commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
2215
</target>
2316

17+
<var file="${common.basedir}/build_config/version.config" description="version properties" />
18+
<trycatch>
19+
<try>
20+
<var file="${common.basedir}/../../build_config/version.config" description="grp version properties" />
21+
</try>
22+
<catch>
23+
</catch>
24+
</trycatch>
25+
<property file="${common.basedir}/build_config/build.config" description="build properties" />
26+
<property file="${common.basedir}/build_config/global.config" description="global properties" />
27+
28+
<property name="version.grp" value="${version_grp_major}.${version_grp_minor}.${version_grp_build}" />
29+
2430

2531
<!-- PLATFORM INFORMATION -->
2632

@@ -80,8 +86,8 @@
8086
<attribute name="name" />
8187
<attribute name="value" />
8288
<![CDATA[
83-
project.setProperty( attributes.get( "name" ),
84-
attributes.get( "value" ).replaceAll( "\\.", "" ) );
89+
project.setNewProperty( attributes.get( "name" ),
90+
attributes.get( "value" ).replaceAll( "\\.", "" ) );
8591
]]>
8692
</scriptdef>
8793

@@ -201,4 +207,15 @@
201207
<var name="android.targetSdkVersion" unset="true" />
202208
<property name="android.targetSdkVersion" value="${targetSdkVersion}" />
203209

210+
211+
<titlecase name="project.grptitle" value="${project.grp}" />
212+
<titlecase name="project.nametitle" value="${project.name}" />
213+
214+
<cleanchars name="ios.name" value="${project.grptitle}${project.nametitle}" />
215+
216+
<cleanchars name="windows.name" value="${project.grp}${project.name}" />
217+
218+
<cleanchars name="macos.name" value="${project.grptitle}${project.nametitle}" />
219+
220+
204221
</project>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace @NAMESPACE@
2+
{
3+
public class @CLASS@
4+
{
5+
public const string EXTENSIONID = "@EXTENSIONID@";
6+
public const string VERSION = "@VERSION@";
7+
}
8+
}

build_config/global.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ output.tmpdir = .tmp
88
codetmpl = ./build_config/_codetmpl
99
airpackage.dir = ./package
1010
airpackage.tmpl = ${airpackage.dir}/_packagetmpl
11-
version.autoincrement = true
11+
version.autoincrement = false
1212
version.android =
1313
version.ios =
1414
docs.external_site_source = /Users/marchbold/work/distriqt/extensions/airnativeextensions/nativeextensions-documentation/source
@@ -48,7 +48,7 @@ android.targetSdkVersion = 33
4848
# SUPPORT
4949
supportlibs.dir = /Users/marchbold/work/distriqt/extensions/supportlibs
5050
supportlibs.corelibraries = ${supportlibs.dir}/corelibraries
51-
supportlibs.corejar = ${supportlibs.corelibraries}/platform/android/bin
51+
supportlibs.corejar = ${supportlibs.corelibraries}/build/android
5252
supportlibs.coreframework = ${supportlibs.corelibraries}/platform/ios/build
5353

5454

@@ -69,3 +69,4 @@ unity.cmd = /Users/marchbold/work/sdks/unity/current/Unity.app/Contents/MacOS/Un
6969
unity.iphoneos_dir = build_unity/${ios.xcode_build}-iphoneos
7070
unity.iphonesimulator_dir = build_unity/${ios.xcode_build}-iphonesimulator
7171
unity.tvos_dir = build_unity/${ios.xcode_build}-appletvos
72+
unity.commondir = Assets/distriqt/Common

build_config/version.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#Tue, 15 Feb 2022 12:43:51 +1000
1+
#Thu, 21 Sep 2023 09:03:42 +1000
22

33
version_major=4
4-
version_minor=1
5-
version_build=0
4+
version_minor=2
5+
version_build=1
66

77
version.android=
88
version.ios=

docs/asdocs/all-classes.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ <h3><a href="class-summary.html" target="classFrame" style="color:black">All Cla
1919
<tr>
2020
<td><a href="com/distriqt/extension/memory/MemoryInfo.html" title="com.distriqt.extension.memory.MemoryInfo">MemoryInfo</a></td>
2121
</tr>
22+
<tr>
23+
<td><a href="com/distriqt/extension/memory/MemoryWarningLevel.html" title="com.distriqt.extension.memory.MemoryWarningLevel">MemoryWarningLevel</a></td>
24+
</tr>
2225
</table>
2326
</body>
2427
</html>
25-
<!--Copyright distriqt 2016<br/>Wed Feb 1 2023, 09:11 PM +10:00 -->
28+
<!--Copyright distriqt 2016<br/>Fri Sep 22 2023, 09:15 AM +10:00 -->

0 commit comments

Comments
 (0)