Skip to content

Commit a8c181e

Browse files
committed
feat(ios): Xcode 14 update, remove bitcode and add no-objc-msgsend-selector-stubs compiler flag
1 parent 7350d07 commit a8c181e

File tree

139 files changed

+870
-845
lines changed

Some content is hidden

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

139 files changed

+870
-845
lines changed

.github/workflows/issues.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: 'Close stale issues and PR'
22
on:
33
schedule:
4-
- cron: '30 1 * * *'
4+
- cron: '30 1 * * 2'
55

66
jobs:
77
stale:
@@ -11,7 +11,7 @@ jobs:
1111
with:
1212
stale-issue-label: 'stale'
1313
exempt-issue-labels: 'enhancement'
14-
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.'
14+
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.'
1515
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.'
1616
close-issue-message: 'This issue was closed because it has been stalled for 5 days with no activity.'
1717
days-before-stale: 60

CHANGELOG.md

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

22

3+
###### 2023.02.01 [v4.1.0]
4+
5+
```
6+
feat(ios): Xcode 14 update, remove bitcode and add no-objc-msgsend-selector-stubs compiler flag
7+
```
8+
9+
310
###### 2022.02.15 [v4.0.11]
411

512
```

build.xml

Lines changed: 55 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project default="all" name="ane.build">
3-
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project default="all" name="ane.build">
3+
44
<import file="build_common.xml" />
55
<property file="${common.basedir}/build_config/build.config" description="build properties" />
6-
7-
6+
7+
88
<macrodef name="iterate">
9-
<attribute name="target"/>
10-
<attribute name="directory"/>
11-
<sequential>
12-
<subant target="@{target}">
13-
<fileset dir="@{directory}">
9+
<attribute name="target" />
10+
<attribute name="directory" />
11+
<sequential>
12+
<subant target="@{target}">
13+
<fileset dir="@{directory}">
1414
<include name="**/build_*.xml" />
1515
</fileset>
16-
</subant>
17-
</sequential>
18-
</macrodef>
19-
20-
16+
</subant>
17+
</sequential>
18+
</macrodef>
19+
20+
2121
<!--
2222
//
2323
//
2424
// VERSIONING
2525
//
2626
//
2727
-->
28-
28+
2929
<target name="version">
3030
<antcall target="version_write" />
3131
</target>
@@ -37,21 +37,17 @@
3737
</target>
3838

3939
<target name="version_write">
40-
<echo file="build/VERSION.md" append="false" >## Version Details
40+
<echo file="build/VERSION.md" append="false">## Version Details
4141

4242
| Extension | Version | Android Lib | iOS Lib |
4343
| --- | --- | --- | --- |
44-
</echo>
44+
</echo>
4545

4646
<var name="version" value="${version_major}.${version_minor}.${version_build}" />
47-
<echo
48-
file="${output.dir}/VERSION.md"
49-
append="true"
50-
message="| ${output.name} | ${version} | ${version.android} | ${version.ios} |${line.separator}" />
47+
<echo file="${output.dir}/VERSION.md" append="true" message="| ${output.name} | ${version} | ${version.android} | ${version.ios} |${line.separator}" />
5148
</target>
5249

5350

54-
5551
<!--
5652
//
5753
//
@@ -62,15 +58,14 @@
6258

6359

6460
<target name="build_platforms">
65-
<iterate target="build" directory="platform" />
61+
<iterate target="build" directory="platform" />
6662
</target>
6763

6864
<target name="clean_platforms">
69-
<iterate target="clean" directory="platform" />
65+
<iterate target="clean" directory="platform" />
7066
</target>
7167

7268

73-
7469
<!--
7570
//
7671
//
@@ -80,17 +75,15 @@
8075
-->
8176

8277

83-
8478
<target name="build_extensions">
85-
<iterate target="build" directory="extension" />
79+
<iterate target="build" directory="extension" />
8680
</target>
8781

8882
<target name="clean_extensions">
89-
<iterate target="clean" directory="extension" />
83+
<iterate target="clean" directory="extension" />
9084
</target>
9185

9286

93-
9487
<!--
9588
//
9689
//
@@ -100,15 +93,15 @@
10093
-->
10194

10295
<target name="docs">
103-
<iterate target="docs" directory="platform" />
96+
<iterate target="docs" directory="platform" />
10497

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

110103
<!-- Copy ASDocs -->
111-
<copy todir="${docs.asdocs_dir}" overwrite="true" >
104+
<copy todir="${docs.asdocs_dir}" overwrite="true">
112105
<fileset dir="docs/asdocs" />
113106
</copy>
114107

@@ -120,11 +113,11 @@
120113

121114
<target name="wikiToPages">
122115
<mkdir dir="docs/pages" />
123-
<echo file="docs/pages/.gitignore" >
116+
<echo file="docs/pages/.gitignore">
124117
Gemfile
125118
_site
126119
</echo>
127-
120+
128121
<delete defaultexcludes="false" includeemptydirs="true">
129122
<fileset dir="docs/pages">
130123
<include name="**/*" />
@@ -133,18 +126,17 @@ _site
133126
</delete>
134127

135128

136-
137129
<!-- Clone the site template -->
138-
<exec executable="git" >
130+
<exec executable="git">
139131
<arg value="clone" />
140132
<arg value="[email protected]:airnativeextensions/github-pages-template.git" />
141133
<arg value="_tmpclone" />
142134
</exec>
143-
<copy todir="docs/pages" overwrite="true" >
135+
<copy todir="docs/pages" overwrite="true">
144136
<fileset dir="_tmpclone" />
145137
<filterchain>
146138
<tokenfilter>
147-
<replacestring from="Template" to="${project.name}"/>
139+
<replacestring from="Template" to="${project.name}" />
148140
</tokenfilter>
149141
</filterchain>
150142
</copy>
@@ -156,57 +148,46 @@ _site
156148
- copy images
157149
- sidebar manipulation to html
158150
-->
159-
<copy todir="docs/pages" overwrite="true" >
151+
<copy todir="docs/pages" overwrite="true">
160152
<fileset dir="docs/wiki" defaultexcludes="false">
161153
<exclude name="**/_Sidebar.md" />
162154
<exclude name="**/_Footer.md" />
163155
<include name="**/*.md" />
164156
</fileset>
165157
<filterchain>
166158
<tokenfilter>
167-
<replacestring from="[[" to="![]("/>
168-
<replacestring from="]]" to=")"/>
159+
<replacestring from="[[" to="![](" />
160+
<replacestring from="]]" to=")" />
169161
</tokenfilter>
170162
</filterchain>
171163
</copy>
172164
<move file="docs/pages/Home.md" tofile="docs/pages/index.md" />
173-
<copy todir="docs/pages" overwrite="true" >
165+
<copy todir="docs/pages" overwrite="true">
174166
<fileset dir="docs/wiki" defaultexcludes="false">
175167
<include name="**/images/**" />
176168
</fileset>
177169
</copy>
178170
<copy file="docs/wiki/_Sidebar.md" tofile="docs/pages/_includes/Sidebar.html" overwrite="true">
179171
<filterchain>
180172
<tokenfilter>
181-
<replacestring from="---" to="&lt;br/&gt;&lt;hr/&gt;"/>
173+
<replacestring from="---" to="&lt;br/&gt;&lt;hr/&gt;" />
182174
<!--<replacestring from="|Home]]" to="|https://airnativeextensions.com/extension/com.distriqt.${project.name}]]"/>-->
183-
<replaceregex flags="g"
184-
pattern="^(.[^\[\(\&lt;]+)$"
185-
replace="&lt;h4&gt;\1&lt;/h4&gt;" />
186-
<replaceregex flags="g"
187-
pattern="\[\[(.+?)\|Home\]\]"
188-
replace="" />
189-
<replaceregex flags="g"
190-
pattern="\[\[(.+?)\|(.+?)\]\]"
191-
replace="&lt;a href='\2'&gt;\1&lt;\/a&gt;&lt;br\/&gt;" />
192-
<replaceregex flags="g"
193-
pattern="\[(.+?)\]\((.+?)\)"
194-
replace="&lt;a href='\2'&gt;\1&lt;\/a&gt;&lt;br\/&gt;" />
175+
<replaceregex flags="g" pattern="^(.[^\[\(\&lt;]+)$" replace="&lt;h4&gt;\1&lt;/h4&gt;" />
176+
<replaceregex flags="g" pattern="\[\[(.+?)\|Home\]\]" replace="" />
177+
<replaceregex flags="g" pattern="\[\[(.+?)\|(.+?)\]\]" replace="&lt;a href='\2'&gt;\1&lt;\/a&gt;&lt;br\/&gt;" />
178+
<replaceregex flags="g" pattern="\[(.+?)\]\((.+?)\)" replace="&lt;a href='\2'&gt;\1&lt;\/a&gt;&lt;br\/&gt;" />
195179
</tokenfilter>
196180
</filterchain>
197181
</copy>
198182

199183
<!-- Copy ASDocs -->
200-
<copy todir="docs/pages/asdocs" overwrite="true" >
184+
<copy todir="docs/pages/asdocs" overwrite="true">
201185
<fileset dir="docs/asdocs" />
202186
</copy>
203187

204188
</target>
205189

206190

207-
208-
209-
210191
<!--
211192
//
212193
//
@@ -215,15 +196,14 @@ _site
215196
//
216197
-->
217198

218-
<target name="airpackage" >
219-
<iterate target="deploy" directory="package" />
220-
</target>
221-
199+
<target name="airpackage">
200+
<iterate target="deploy" directory="package" />
201+
</target>
222202

223-
<target name="clean_airpackage" >
224-
<iterate target="clean" directory="package" />
225-
</target>
226203

204+
<target name="clean_airpackage">
205+
<iterate target="clean" directory="package" />
206+
</target>
227207

228208

229209
<!--
@@ -237,31 +217,29 @@ _site
237217
<target name="deploy">
238218

239219
<lower name="project.namelower" value="${project.name}" />
240-
220+
241221
<delete dir="${docs.external_site_source}/docs/${project.namelower}" />
242222
<delete dir="${docs.external_site_source}/static/asdocs/${project.namelower}" />
243223

244224
<!-- Copy docs to site -->
245225
<copy todir="${docs.external_site_source}" overwrite="true" failonerror="false">
246-
<fileset dir="docs/site" >
226+
<fileset dir="docs/site">
247227
<include name="**/*" />
248228
<exclude name="sidebars.js" />
249229
</fileset>
250230
</copy>
251-
252-
<copy tofile="${docs.external_site_source}/docs/${project.namelower}/changelog.md" overwrite="true"
253-
file="CHANGELOG.md" >
231+
232+
<copy tofile="${docs.external_site_source}/docs/${project.namelower}/changelog.md" overwrite="true" file="CHANGELOG.md">
254233
<filterchain>
255234
<tokenfilter>
256-
<replacestring from="######" to="###"/>
235+
<replacestring from="######" to="###" />
257236
</tokenfilter>
258237
</filterchain>
259238
</copy>
260239

261240
</target>
262241

263242

264-
265243
<!--
266244
//
267245
//
@@ -272,9 +250,11 @@ _site
272250

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

275-
<target name="clean" depends="clean_platforms, clean_extensions, clean_airpackage" />
253+
<target name="clean" depends="clean_platforms, clean_extensions, clean_airpackage" >
254+
<delete dir="${common.basedir}/${output.dir}" />
255+
</target>
276256

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

279259

280-
</project>
260+
</project>

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.0.11 | | |
5+
| com.distriqt.Memory | 4.1.0 | | |

build/com.distriqt.Memory.ane

-117 KB
Binary file not shown.

build/swc/com.distriqt.Memory.swc

-6 Bytes
Binary file not shown.

build_common.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,17 @@
6565
]]>
6666
</scriptdef>
6767

68+
<scriptdef language="javascript" name="titlecase">
69+
<attribute name="name" />
70+
<attribute name="value" />
71+
<![CDATA[
72+
var value = String(attributes.get( "value" ));
73+
var titlecase = value.charAt(0).toUpperCase() + value.substr(1);
74+
75+
project.setProperty( attributes.get( "name" ), titlecase );
76+
]]>
77+
</scriptdef>
78+
6879
<scriptdef language="javascript" name="cleanchars">
6980
<attribute name="name" />
7081
<attribute name="value" />
@@ -166,4 +177,28 @@
166177
<grppackagename name="package.name" prefix="${package.basename}" grp="${project.grp}" projectname="${project.name}" />
167178
<packagepath name="package.path" value="${package.name}" />
168179

180+
<loadproperties srcFile="${common.basedir}/${android.dir}/app/build.gradle">
181+
<filterchain>
182+
<linecontains>
183+
<contains value="minSdkVersion"/>
184+
</linecontains>
185+
<replaceregex pattern="\sminSdkVersion\s([0-9]*)" replace="minSdkVersion=\1" />
186+
</filterchain>
187+
</loadproperties>
188+
<property name="minSdkVersion" value="${android.minSdkVersion}" />
189+
<var name="android.minSdkVersion" unset="true" />
190+
<property name="android.minSdkVersion" value="${minSdkVersion}" />
191+
192+
<loadproperties srcFile="${common.basedir}/${android.dir}/app/build.gradle">
193+
<filterchain>
194+
<linecontains>
195+
<contains value="targetSdkVersion"/>
196+
</linecontains>
197+
<replaceregex pattern="\stargetSdkVersion\s([0-9]*)" replace="targetSdkVersion=\1" />
198+
</filterchain>
199+
</loadproperties>
200+
<property name="targetSdkVersion" value="${android.targetSdkVersion}" />
201+
<var name="android.targetSdkVersion" unset="true" />
202+
<property name="android.targetSdkVersion" value="${targetSdkVersion}" />
203+
169204
</project>

0 commit comments

Comments
 (0)