Skip to content

Commit

Permalink
feat(airpackage): update to support latest Core extension with major …
Browse files Browse the repository at this point in the history 
…Android / iOS updates
  • Loading branch information
@marchbold
marchbold committed Feb 1, 2023
1 parent ef163ac commit a63785d
Show file tree
Hide file tree
Showing 125 changed files with 996 additions and 661 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/issues.yml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
name: 'Close stale issues and PR'
on:
schedule:
- cron: '30 1 * * *'
- cron: '30 1 * * 2'

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v4
with:
stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
stale-issue-label: 'stale'
exempt-issue-labels: 'enhancement'
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
stale-pr-message: 'This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days.'
close-issue-message: 'This issue was closed because it has been stalled for 5 days with no activity.'
days-before-stale: 30
days-before-stale: 60
days-before-close: 5
days-before-pr-close: -1
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@


###### 2023.02.01 [v1.1.0]

```
feat(airpackage): update to support latest Core extension with major Android / iOS updates
```


###### 2021.12.06 [v1.0.24]

```
Expand Down
137 changes: 64 additions & 73 deletions build.xml
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="all" name="ane.build">
<?xml version="1.0" encoding="UTF-8"?>
<project default="all" name="ane.build">

<import file="build_common.xml" />
<property file="${common.basedir}/build_config/build.config" description="build properties" />


<macrodef name="iterate">
<attribute name="target"/>
<attribute name="directory"/>
<sequential>
<subant target="@{target}">
<fileset dir="@{directory}">
<attribute name="target" />
<attribute name="directory" />
<sequential>
<subant target="@{target}">
<fileset dir="@{directory}">
<include name="**/build_*.xml" />
</fileset>
</subant>
</sequential>
</macrodef>
</subant>
</sequential>
</macrodef>


<!--
//
//
// VERSIONING
//
//
-->

<target name="version">
<antcall target="version_write" />
</target>
Expand All @@ -37,21 +37,17 @@
</target>

<target name="version_write">
<echo file="build/VERSION.md" append="false" >## Version Details
<echo file="build/VERSION.md" append="false">## Version Details

| Extension | Version | Android Lib | iOS Lib |
| --- | --- | --- | --- |
</echo>
</echo>

<var name="version" value="${version_major}.${version_minor}.${version_build}" />
<echo
file="${output.dir}/VERSION.md"
append="true"
message="| ${output.name} | ${version} | ${version.android} | ${version.ios} |${line.separator}" />
<echo file="${output.dir}/VERSION.md" append="true" message="| ${output.name} | ${version} | ${version.android} | ${version.ios} |${line.separator}" />
</target>



<!--
//
//
Expand All @@ -62,15 +58,14 @@


<target name="build_platforms">
<iterate target="build" directory="platform" />
<iterate target="build" directory="platform" />
</target>

<target name="clean_platforms">
<iterate target="clean" directory="platform" />
<iterate target="clean" directory="platform" />
</target>



<!--
//
//
Expand All @@ -80,17 +75,15 @@
-->



<target name="build_extensions">
<iterate target="build" directory="extension" />
<iterate target="build" directory="extension" />
</target>

<target name="clean_extensions">
<iterate target="clean" directory="extension" />
<iterate target="clean" directory="extension" />
</target>



<!--
//
//
Expand All @@ -100,15 +93,15 @@
-->

<target name="docs">
<iterate target="docs" directory="platform" />
<iterate target="docs" directory="platform" />

<!-- Ensure documentation is updated -->
<lower name="project.namelower" value="${project.name}" />
<var name="docs.dir" value="docs/site/docs/${project.namelower}" />
<var name="docs.asdocs_dir" value="docs/site/static/asdocs/${project.namelower}" />

<!-- Copy ASDocs -->
<copy todir="${docs.asdocs_dir}" overwrite="true" >
<copy todir="${docs.asdocs_dir}" overwrite="true">
<fileset dir="docs/asdocs" />
</copy>

Expand All @@ -120,11 +113,11 @@

<target name="wikiToPages">
<mkdir dir="docs/pages" />
<echo file="docs/pages/.gitignore" >
<echo file="docs/pages/.gitignore">
Gemfile
_site
</echo>

<delete defaultexcludes="false" includeemptydirs="true">
<fileset dir="docs/pages">
<include name="**/*" />
Expand All @@ -133,18 +126,17 @@ _site
</delete>



<!-- Clone the site template -->
<exec executable="git" >
<exec executable="git">
<arg value="clone" />
<arg value="[email protected]:airnativeextensions/github-pages-template.git" />
<arg value="_tmpclone" />
</exec>
<copy todir="docs/pages" overwrite="true" >
<copy todir="docs/pages" overwrite="true">
<fileset dir="_tmpclone" />
<filterchain>
<tokenfilter>
<replacestring from="Template" to="${project.name}"/>
<replacestring from="Template" to="${project.name}" />
</tokenfilter>
</filterchain>
</copy>
Expand All @@ -156,57 +148,46 @@ _site
- copy images
- sidebar manipulation to html
-->
<copy todir="docs/pages" overwrite="true" >
<copy todir="docs/pages" overwrite="true">
<fileset dir="docs/wiki" defaultexcludes="false">
<exclude name="**/_Sidebar.md" />
<exclude name="**/_Footer.md" />
<include name="**/*.md" />
</fileset>
<filterchain>
<tokenfilter>
<replacestring from="[[" to="![]("/>
<replacestring from="]]" to=")"/>
<replacestring from="[[" to="![](" />
<replacestring from="]]" to=")" />
</tokenfilter>
</filterchain>
</copy>
<move file="docs/pages/Home.md" tofile="docs/pages/index.md" />
<copy todir="docs/pages" overwrite="true" >
<copy todir="docs/pages" overwrite="true">
<fileset dir="docs/wiki" defaultexcludes="false">
<include name="**/images/**" />
</fileset>
</copy>
<copy file="docs/wiki/_Sidebar.md" tofile="docs/pages/_includes/Sidebar.html" overwrite="true">
<filterchain>
<tokenfilter>
<replacestring from="---" to="&lt;br/&gt;&lt;hr/&gt;"/>
<replacestring from="---" to="&lt;br/&gt;&lt;hr/&gt;" />
<!--<replacestring from="|Home]]" to="|https://airnativeextensions.com/extension/com.distriqt.${project.name}]]"/>-->
<replaceregex flags="g"
pattern="^(.[^\[\(\&lt;]+)$"
replace="&lt;h4&gt;\1&lt;/h4&gt;" />
<replaceregex flags="g"
pattern="\[\[(.+?)\|Home\]\]"
replace="" />
<replaceregex flags="g"
pattern="\[\[(.+?)\|(.+?)\]\]"
replace="&lt;a href='\2'&gt;\1&lt;\/a&gt;&lt;br\/&gt;" />
<replaceregex flags="g"
pattern="\[(.+?)\]\((.+?)\)"
replace="&lt;a href='\2'&gt;\1&lt;\/a&gt;&lt;br\/&gt;" />
<replaceregex flags="g" pattern="^(.[^\[\(\&lt;]+)$" replace="&lt;h4&gt;\1&lt;/h4&gt;" />
<replaceregex flags="g" pattern="\[\[(.+?)\|Home\]\]" replace="" />
<replaceregex flags="g" pattern="\[\[(.+?)\|(.+?)\]\]" replace="&lt;a href='\2'&gt;\1&lt;\/a&gt;&lt;br\/&gt;" />
<replaceregex flags="g" pattern="\[(.+?)\]\((.+?)\)" replace="&lt;a href='\2'&gt;\1&lt;\/a&gt;&lt;br\/&gt;" />
</tokenfilter>
</filterchain>
</copy>

<!-- Copy ASDocs -->
<copy todir="docs/pages/asdocs" overwrite="true" >
<copy todir="docs/pages/asdocs" overwrite="true">
<fileset dir="docs/asdocs" />
</copy>

</target>





<!--
//
//
Expand All @@ -215,15 +196,14 @@ _site
//
-->

<target name="airpackage" >
<iterate target="deploy" directory="package" />
</target>

<target name="airpackage">
<iterate target="deploy" directory="package" />
</target>

<target name="clean_airpackage" >
<iterate target="clean" directory="package" />
</target>

<target name="clean_airpackage">
<iterate target="clean" directory="package" />
</target>


<!--
Expand All @@ -236,19 +216,28 @@ _site

<target name="deploy">

<lower name="project.namelower" value="${project.name}" />

<delete dir="${docs.external_site_source}/docs/${project.namelower}" />
<delete dir="${docs.external_site_source}/static/asdocs/${project.namelower}" />

<!-- Copy docs to site -->
<copy todir="${docs.external_site_source}" overwrite="true" failonerror="false">
<fileset dir="docs/site" >
<fileset dir="docs/site">
<include name="**/*" />
<exclude name="sidebars.js" />
</fileset>
</copy>

<lower name="project.namelower" value="${project.name}" />
<copy tofile="${docs.external_site_source}/docs/${project.namelower}/changelog.md" overwrite="true" file="CHANGELOG.md" />

</target>
<copy tofile="${docs.external_site_source}/docs/${project.namelower}/changelog.md" overwrite="true" file="CHANGELOG.md">
<filterchain>
<tokenfilter>
<replacestring from="######" to="###" />
</tokenfilter>
</filterchain>
</copy>

</target>


<!--
Expand All @@ -261,9 +250,11 @@ _site

<target name="all" depends="version, build_platforms, build_extensions" />

<target name="clean" depends="clean_platforms, clean_extensions, clean_airpackage" />
<target name="clean" depends="clean_platforms, clean_extensions, clean_airpackage" >
<delete dir="${common.basedir}/${output.dir}" />
</target>

<target name="release" depends="version, docs, deploy" />


</project>
</project>
2 changes: 1 addition & 1 deletion build/VERSION.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

| Extension | Version | Android Lib | iOS Lib |
| --- | --- | --- | --- |
| com.distriqt.JobScheduler | 1.0.24 | | |
| com.distriqt.JobScheduler | 1.1.0 | | |
Binary file modified build/com.distriqt.JobScheduler.ane
View file
Binary file not shown.
Binary file modified build/swc/com.distriqt.JobScheduler.swc
View file
Binary file not shown.
35 changes: 35 additions & 0 deletions build_common.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@
]]>
</scriptdef>

<scriptdef language="javascript" name="titlecase">
<attribute name="name" />
<attribute name="value" />
<![CDATA[
var value = String(attributes.get( "value" ));
var titlecase = value.charAt(0).toUpperCase() + value.substr(1);
project.setProperty( attributes.get( "name" ), titlecase );
]]>
</scriptdef>

<scriptdef language="javascript" name="cleanchars">
<attribute name="name" />
<attribute name="value" />
Expand Down Expand Up @@ -166,4 +177,28 @@
<grppackagename name="package.name" prefix="${package.basename}" grp="${project.grp}" projectname="${project.name}" />
<packagepath name="package.path" value="${package.name}" />

<loadproperties srcFile="${common.basedir}/${android.dir}/app/build.gradle">
<filterchain>
<linecontains>
<contains value="minSdkVersion"/>
</linecontains>
<replaceregex pattern="\sminSdkVersion\s([0-9]*)" replace="minSdkVersion=\1" />
</filterchain>
</loadproperties>
<property name="minSdkVersion" value="${android.minSdkVersion}" />
<var name="android.minSdkVersion" unset="true" />
<property name="android.minSdkVersion" value="${minSdkVersion}" />

<loadproperties srcFile="${common.basedir}/${android.dir}/app/build.gradle">
<filterchain>
<linecontains>
<contains value="targetSdkVersion"/>
</linecontains>
<replaceregex pattern="\stargetSdkVersion\s([0-9]*)" replace="targetSdkVersion=\1" />
</filterchain>
</loadproperties>
<property name="targetSdkVersion" value="${android.targetSdkVersion}" />
<var name="android.targetSdkVersion" unset="true" />
<property name="android.targetSdkVersion" value="${targetSdkVersion}" />

</project>
Loading

0 comments on commit a63785d

Please sign in to comment.