Android X migration

distriqt · Mar 25, 2020 · 29e7e0c · 29e7e0c
1 parent d2867fe
commit 29e7e0c
Show file tree

Hide file tree

Showing 16 changed files with 93 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 
 
+###### 2020.03.25 [v1.0.022]
+
+```
+Android X migration
+```
+
+
 ###### 2019.07.04 [v0.0.017]
 
 ```

diff --git a/build.xml b/build.xml
@@ -28,14 +28,24 @@
 
 	<target name="version">
 		<antcall target="version_increment" />
+		<antcall target="version_write" />
 	</target>
 
-	<target name="version_increment">
+	<target name="version_increment" if="${version.autoincrement}">
 		<propertyfile file="./build_config/version.config">
 			<entry key="version_build" type="int" operation="+" value="1" pattern="000" />
 		</propertyfile>
 	</target>
 
+	<target name="version_write">
+		<var name="version" value="${version_major}.${version_minor}.${version_build}" />
+		<echo 
+			file="${output.dir}/VERSION.md" 
+			append="false" 
+			message="| ${output.name} | ${version} | ${version.android} | ${version.ios} |${line.separator}" />
+	</target>
+
+
 
 	<!-- 
 	//

diff --git a/build/VERSION.md b/build/VERSION.md
@@ -0,0 +1 @@
+| com.distriqt.JobScheduler | 1.0.021 |  |  |
diff --git a/build/com.distriqt.JobScheduler.ane b/build/com.distriqt.JobScheduler.ane
diff --git a/build_common.xml b/build_common.xml
@@ -4,10 +4,10 @@
 
 	<dirname property="common.basedir" file="${ant.file.common}" />
 
-	<property file="${common.basedir}/build_config/build.config" description="build properties" />
-	<property file="${common.basedir}/build_config/global.config" description="global properties" />
 	<property file="${common.basedir}/../../build_config/version.config" description="grp version properties" />
 	<property file="${common.basedir}/build_config/version.config" description="build version properties" />
+	<property file="${common.basedir}/build_config/build.config" description="build properties" />
+	<property file="${common.basedir}/build_config/global.config" description="global properties" />
 
 	<property name="version.grp" value="${version_grp_major}.${version_grp_minor}.${version_grp_build}" />
 

diff --git a/build_config/build.config b/build_config/build.config
@@ -26,6 +26,7 @@ actionscript.dir = ./platform/actionscript
 default.dir = ./platform/default
 
 ios.enabled = false
+iosimulator.enabled = false
 tvos.enabled = false
 ios.dir = ./platform/ios
 ios.packagecoreframework = false

diff --git a/build_config/global.config b/build_config/global.config
@@ -6,7 +6,9 @@
 # DEFAULTS
 output.tmpdir = .tmp
 codetmpl = ./build_config/_codetmpl
-
+version.autoincrement = true
+version.android = 
+version.ios = 
 
 # AIR SDK
 air.sdk.macos = /Users/marchbold/work/sdks/air/current
@@ -15,6 +17,9 @@ air.swfversion = 24.0
 
 
 # IOS
+ios.enabled = true
+iosimulator.enabled = true
+tvos.enabled = false
 ios.sdk = /Users/marchbold/work/sdks/ios/iPhoneOS9.3.sdk
 ios.xcode_buildpath = /Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild
 ios.build_dir = build
@@ -35,7 +40,7 @@ android.jetifier = /Users/marchbold/bin/jetifier/bin/jetifier-standalone
 # SUPPORT
 supportlibs.dir = /Users/marchbold/work/distriqt/extensions/supportlibs
 supportlibs.corelibraries = ${supportlibs.dir}/corelibraries
-supportlibs.corejar = ${supportlibs.corelibraries}/platform/android/bin/*.jar
+supportlibs.corejar = ${supportlibs.corelibraries}/platform/android/bin
 supportlibs.coreframework = ${supportlibs.corelibraries}/platform/ios/build
 
 

diff --git a/build_config/version.config b/build_config/version.config
@@ -1,5 +1,5 @@
-#Tue, 10 Mar 2020 19:17:26 +1000
+#Wed, 25 Mar 2020 21:55:54 +1000
 
 version_major=1
 version_minor=0
-version_build=019
+version_build=022
diff --git a/extension/air/build_air.xml b/extension/air/build_air.xml
@@ -178,7 +178,7 @@
 			<arg line="-swc ${common.basedir}/${actionscript.dir}/bin/${actionscript.name}"/>
 
 			<arg line="-platform iPhone-ARM -platformoptions ${ios.dir}/platform_ios${variant}.build.xml -C ${ios.dir}/${ios.build_dir}/${variant}/${ios.iphoneos_dir} ." if:true="${ios.enabled}" />
-			<arg line="-platform iPhone-x86 -platformoptions ${ios.dir}/platform_ios${variant}.build.xml -C ${ios.dir}/${ios.build_dir}/${variant}/${ios.iphonesimulator_dir} ." if:true="${ios.enabled}" />
+			<arg line="-platform iPhone-x86 -platformoptions ${ios.dir}/platform_ios${variant}.build.xml -C ${ios.dir}/${ios.build_dir}/${variant}/${ios.iphonesimulator_dir} ." if:true="${iosimulator.enabled}" />
 			<arg line="-platform appleTV-ARM -platformoptions ${ios.dir}/platform_tvos${variant}.build.xml -C ${ios.dir}/${ios.build_dir}/${variant}/${ios.tvos_dir} ." if:true="${tvos.enabled}" /> 
 
 			<arg line="-platform Android-ARM -platformoptions ${android.dir}/platform_android${variant}.build.xml -C ${android.dir}/${android.outputdir} ." if:true="${android.enabled}" />
@@ -211,58 +211,53 @@
 
     <target name="prepare_ios"  description="Copy iOS files for packaging" if="${ios.enabled}">
 
+
+		<fileset id="iphoneosdir" dir="${common.basedir}/${ios.dir}/${ios.build_dir}/${variant}/${ios.iphoneos_dir}" erroronmissingdir="false">
+			<include name="**/*"/>
+		</fileset>
+		<fileset id="iphonesimulatordir" dir="${common.basedir}/${ios.dir}/${ios.build_dir}/${variant}/${ios.iphonesimulator_dir}" erroronmissingdir="false">
+			<include name="**/*"/>
+		</fileset>
+		<fileset id="tvosdir" dir="${common.basedir}/${ios.dir}/${ios.build_dir}/${variant}/${ios.tvos_dir}" erroronmissingdir="false">
+			<include name="**/*"/>
+		</fileset>
+		<fileset id="codedir" dir="${common.basedir}/${ios.dir}/${ios.name}" erroronmissingdir="false" >
+			<include name="*.framework/**"/>
+			<exclude name="*.framework/Versions/**"/>
+			<include name="*.bundle/**"/>
+		</fileset>
+		<fileset id="libsvariantdir" dir="${common.basedir}/${ios.dir}/libs/${variant}" erroronmissingdir="false">
+			<include name="*.framework/**"/>
+			<exclude name="*.framework/Versions/**"/>
+			<include name="*.bundle/**"/>
+		</fileset>
+
         <copy overwrite="true" todir="${ios.dir}/${ios.build_dir}/${variant}/${ios.iphoneos_dir}" >
-            <fileset dir="${common.basedir}/${ios.dir}/${ios.build_dir}/${variant}/${ios.iphoneos_dir}" erroronmissingdir="false">
-				<include name="**/*"/>
-			</fileset>
+			<resources>
+				<union>
+					<resources refid="iphoneosdir" />
+					<resources refid="codedir" />
+					<resources refid="libsvariantdir" />
+				</union>
+			</resources>
 		</copy>
         <copy overwrite="true" todir="${ios.dir}/${ios.build_dir}/${variant}/${ios.iphonesimulator_dir}" >
-            <fileset dir="${common.basedir}/${ios.dir}/${ios.build_dir}/${variant}/${ios.iphonesimulator_dir}" erroronmissingdir="false">
-				<include name="**/*"/>
-			</fileset>
+            <resources>
+				<union>
+					<resources refid="iphonesimulatordir" />
+					<resources refid="codedir" />
+					<resources refid="libsvariantdir" />
+				</union>
+			</resources>
 		</copy>
         <copy overwrite="true" todir="${ios.dir}/${ios.build_dir}/${variant}/${ios.tvos_dir}" if:true="${tvos.enabled}">
-            <fileset dir="${common.basedir}/${ios.dir}/${ios.build_dir}/${variant}/${ios.tvos_dir}" erroronmissingdir="false">
-				<include name="**/*"/>
-			</fileset>
-		</copy>
-
-		<copy overwrite="true" todir="${ios.dir}/${ios.build_dir}/${variant}/${ios.iphoneos_dir}" >
-			<fileset dir="${common.basedir}/${ios.dir}/${ios.name}" erroronmissingdir="false">
-				<include name="*.framework/**"/>
-				<include name="*.bundle/**"/>
-			</fileset>
-		</copy>
-		<copy overwrite="true" todir="${ios.dir}/${ios.build_dir}/${variant}/${ios.iphonesimulator_dir}" >
-			<fileset dir="${common.basedir}/${ios.dir}/${ios.name}" erroronmissingdir="false">
-				<include name="*.framework/**"/>
-				<include name="*.bundle/**"/>
-			</fileset>
-		</copy>
-		<copy overwrite="true" todir="${ios.dir}/${ios.build_dir}/${variant}/${ios.tvos_dir}" if:true="${tvos.enabled}">
-			<fileset dir="${common.basedir}/${ios.dir}/${ios.name}" erroronmissingdir="false">
-				<include name="*.framework/**"/>
-				<include name="*.bundle/**"/>
-			</fileset>
-		</copy>
-
-		<copy overwrite="true" todir="${ios.dir}/${ios.build_dir}/${variant}/${ios.iphoneos_dir}" >
-			<fileset dir="${common.basedir}/${ios.dir}/libs/${variant}" erroronmissingdir="false">
-				<include name="*.framework/**"/>
-				<include name="*.bundle/**"/>
-			</fileset>
-		</copy>
-		<copy overwrite="true" todir="${ios.dir}/${ios.build_dir}/${variant}/${ios.iphonesimulator_dir}" >
-			<fileset dir="${common.basedir}/${ios.dir}/libs/${variant}" erroronmissingdir="false">
-				<include name="*.framework/**"/>
-				<include name="*.bundle/**"/>
-			</fileset>
-		</copy>
-		<copy overwrite="true" todir="${ios.dir}/${ios.build_dir}/${variant}/${ios.tvos_dir}" if:true="${tvos.enabled}">
-			<fileset dir="${common.basedir}/${ios.dir}/libs/${variant}" erroronmissingdir="false">
-				<include name="*.framework/**"/>
-				<include name="*.bundle/**"/>
-			</fileset>
+            <resources>
+				<union>
+					<resources refid="tvosdir" />
+					<resources refid="codedir" />
+					<resources refid="libsvariantdir" />
+				</union>
+			</resources>
 		</copy>
 
 		<delete failonerror="false">
@@ -449,15 +444,13 @@
 
 	<target name="explode_aar">
 		<basename property="explode_aar_name" file="${explode_aar_file}" suffix=".aar" />
-		<var name="explode_aar_name_lang" unset="true"/>
-		<striplangcode name="explode_aar_name_lang" value="${explode_aar_name}" />
-		<echo message="explode ${explode_aar_file} ${explode_aar_name} ${explode_aar_name_lang}" />
+		<echo message="explode ${explode_aar_file} ${explode_aar_name}" />
 
 		<mkdir dir="${android.dir}/${output.tmpdir}" />
 		<unzip src="${explode_aar_file}" dest="${android.dir}/${output.tmpdir}" overwrite="true"/>
 
 		<copy file="${android.dir}/${output.tmpdir}/classes.jar" tofile="${android.dir}/${android.outputdir}/${explode_aar_name}.jar" />
-		<copy includeEmptyDirs="false" overwrite="true" todir="${android.dir}/${android.outputdir}/${explode_aar_name_lang}-res" failonerror="false">
+		<copy includeEmptyDirs="false" overwrite="true" todir="${android.dir}/${android.outputdir}/${explode_aar_name}-res" failonerror="false">
 			<fileset dir="${android.dir}/${output.tmpdir}/res/" />
 		</copy>
 
@@ -470,15 +463,6 @@
 	</target>
 
 
-	<scriptdef language="javascript" name="striplangcode">
-		<attribute name="name" />
-		<attribute name="value" /> 
-		<![CDATA[
-		project.setProperty( attributes.get( "name" ),
-							 attributes.get( "value" ).replace( /-ui-/g, "-" ) );
-		]]>
-	</scriptdef>
-
 
 	<!-- 
 	//

diff --git a/platform/actionscript/build_actionscript.xml b/platform/actionscript/build_actionscript.xml
@@ -43,6 +43,7 @@
 			<filterchain>
 				<tokenfilter>
 					<replacestring from="@VERSION@" to="${version}"/>
+					<replacestring from="@VERSIONEXT@" to="${version.grp}"/>
 					<replacestring from="@EXTENSIONID@" to="${output.name}"/>
 					<replacestring from="@PACKAGE@" to="${package.name}"/>
 				</tokenfilter>

diff --git a/platform/actionscript/src/com/distriqt/extension/jobscheduler/Const.as b/platform/actionscript/src/com/distriqt/extension/jobscheduler/Const.as
@@ -3,6 +3,6 @@ package com.distriqt.extension.jobscheduler
 	internal final class Const
 	{
 		public static const EXTENSIONID : String = "com.distriqt.JobScheduler"; 
-		public static const VERSION : String = "1.0.019"; 
+		public static const VERSION : String = "1.0.022"; 
 	}
 }
diff --git a/platform/android/.idea/gradle.xml b/platform/android/.idea/gradle.xml
diff --git a/platform/android/.idea/misc.xml b/platform/android/.idea/misc.xml
diff --git a/platform/android/app/app.iml b/platform/android/app/app.iml
@@ -90,9 +90,9 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/marchbold/work/distriqt/extensions/opensource/jobscheduler/source/platform/android/app/libs/FlashRuntimeExtensions.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/marchbold/work/distriqt/extensions/opensource/jobscheduler/source/platform/android/app/libs/runtimeClasses.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/marchbold/work/distriqt/extensions/opensource/jobscheduler/source/platform/android/app/libs/corenativeextension.android.lib.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/marchbold/work/distriqt/extensions/opensource/jobscheduler/source/platform/android/app/libs/corenativeextension.android.lib.air.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:./app/libs/FlashRuntimeExtensions.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:./app/libs/runtimeClasses.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:./app/libs/corenativeextension.android.lib.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:./app/libs/corenativeextension.android.lib.air.jar:unspecified@jar" level="project" />
   </component>
 </module>
diff --git a/platform/default/build_default.xml b/platform/default/build_default.xml
@@ -41,6 +41,7 @@
 			<filterchain>
 				<tokenfilter>
 					<replacestring from="@VERSION@" to="${version}"/>
+					<replacestring from="@VERSIONEXT@" to="${version.grp}"/>
 					<replacestring from="@EXTENSIONID@" to="${output.name}"/>
 					<replacestring from="@PACKAGE@" to="${package.name}"/>
 				</tokenfilter>

diff --git a/platform/default/src/com/distriqt/extension/jobscheduler/Const.as b/platform/default/src/com/distriqt/extension/jobscheduler/Const.as
@@ -3,6 +3,6 @@ package com.distriqt.extension.jobscheduler
 	internal final class Const
 	{
 		public static const EXTENSIONID : String = "com.distriqt.JobScheduler"; 
-		public static const VERSION : String = "1.0.019"; 
+		public static const VERSION : String = "1.0.022"; 
 	}
 }