Skip to content

Commit

Permalink
[android] enable 64-bit in standalone builds for SDK33 (expo#4565)
Browse files Browse the repository at this point in the history
* [android] enable 64-bit in standalone builds

* [tools] update @expo/xdl 55.0.14

* [expokit] gulp update-exponent-view
  • Loading branch information
wkozyra95 committed Jul 2, 2019
1 parent 9c4d452 commit 112f447
Show file tree
Hide file tree
Showing 666 changed files with 1,646 additions and 1,252 deletions.
8 changes: 4 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ android {
ndk {
// We use different `abiFilters` for distributing
// to be able to bundle old, incompatible SDKs.

// WHEN_DISTRIBUTING_REMOVE_FROM_HERE
abiFilters 'armeabi-v7a', 'x86'
// WHEN_DISTRIBUTING_REMOVE_TO_HERE

/* UNCOMMENT WHEN DISTRIBUTING
abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a', 'x86_64'
END UNCOMMENT WHEN DISTRIBUTING */
Expand Down Expand Up @@ -103,7 +103,7 @@ devicefarm {

configurations.all {
resolutionStrategy {
force 'org.webkit:android-jsc:r241213'
force 'org.webkit:android-jsc:r245459'
}
}

Expand Down Expand Up @@ -223,7 +223,7 @@ dependencies {
// WHEN_DISTRIBUTING_REMOVE_TO_HERE

/* UNCOMMENT WHEN DISTRIBUTING
api 'org.webkit:android-jsc:r241213' // needs to be before react-native
api 'org.webkit:android-jsc:r245459' // needs to be before react-native
api 'com.facebook.react:react-native:33.0.0'
END UNCOMMENT WHEN DISTRIBUTING */

Expand Down
4 changes: 2 additions & 2 deletions android/expoview/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ gradle.taskGraph.whenReady {

configurations.all {
resolutionStrategy {
force 'org.webkit:android-jsc:r241213'
force 'org.webkit:android-jsc:r245459'
}
}

Expand All @@ -135,7 +135,7 @@ dependencies {

// WHEN_VERSIONING_REMOVE_FROM_HERE

api 'org.webkit:android-jsc:r241213' // needs to be before react-native
api 'org.webkit:android-jsc:r245459' // needs to be before react-native

/* UNCOMMENT WHEN DISTRIBUTING
api 'com.facebook.react:react-native:33.0.0'
Expand Down
4 changes: 2 additions & 2 deletions apps/expo-payments/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ devicefarm {

configurations.all {
resolutionStrategy {
force 'org.webkit:android-jsc:r241213'
force 'org.webkit:android-jsc:r245459'
}
}

Expand Down Expand Up @@ -178,7 +178,7 @@ dependencies {
exclude group: 'com.squareup.okhttp3', module: 'okhttp-urlconnection'
}

api 'org.webkit:android-jsc:r241213' // needs to be before react-native
api 'org.webkit:android-jsc:r245459' // needs to be before react-native
api 'com.facebook.react:react-native:33.0.0'

implementation project(':unimodules-core')
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e3f7987f3c4082d7dac253e5878f00d2
e51094ed6592eed4ddecd115e33ef72e
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3d904bf311c3d2f50ac3b21b8d4f1e942e020af8
22f9e21aa86d600ad91c37b84bf0d14680f42dc6
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d039368a60b97151c3f2bd91b3f8f92e
5ebb26ffc080f761851dddaa551f684b
Original file line number Diff line number Diff line change
@@ -1 +1 @@
506046440d931c3a40991941576c448243c0e175
5ec4b3f9e81f799d7acd360211469e7ea56a8e55
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
64964a5a6c8985bca0432dfb027a1c17
92c808a9d1aac067e452bb06af894d1f
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1930280303f3507227edca6db038d78044c7c480
01b5ff8a779d1d810f6118c00d1cba571838459a
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>33.0.0</version>
</versions>
<lastUpdated>20190617131031</lastUpdated>
<lastUpdated>20190702091351</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>33.0.0</version>
</versions>
<lastUpdated>20190617131031</lastUpdated>
<lastUpdated>20190702091351</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
136ebd69963dc121f9d0397dca8c6df0
38cf27aec4f20de139b4d6e1fbbaad8a
Original file line number Diff line number Diff line change
@@ -1 +1 @@
56edf4b7d15d1eba58ed9e829231d203134f4645
4b4b9079f9b2c4260be126fe079732195bf45d17
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#NOTE: This is an internal implementation file, its format can be changed without prior notice.
#Mon Jun 17 15:10:31 CEST 2019
maven-metadata-remote.xml.lastUpdated=1560777031329
#Tue Jul 02 11:13:51 CEST 2019
maven-metadata-remote.xml.lastUpdated=1562058831955
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3e2a01cfb74f10ce25da15ec7b1cf326
aee862c33ce66409dc8fa82b55d4cdba
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bc8896c3dbebbe404c2e7ff11b1237fe95b29285
ce9b8692bdf8551b83dfa86cdf8b348246396935
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="host.exp.exponent" module="expo-ads-admob" revision="5.0.1" status="integration" publication="20190617151052"/>
<info organisation="host.exp.exponent" module="expo-ads-admob" revision="5.0.1" status="integration" publication="20190702111400"/>
<configurations>
<conf name="_internal_aapt2_binary" visibility="private" transitive="false"/>
<conf name="androidApis" visibility="public"/>
Expand Down Expand Up @@ -108,7 +108,7 @@
</publications>
<dependencies>
<dependency org="com.android.tools.build" name="aapt2" rev="3.3.2-5309881" conf="_internal_aapt2_binary-&gt;default">
<artifact name="aapt2" type="jar" ext="jar" m:classifier="osx" conf="_internal_aapt2_binary"/>
<artifact name="aapt2" type="jar" ext="jar" m:classifier="linux" conf="_internal_aapt2_binary"/>
</dependency>
<dependency org="com.google.android.gms" name="play-services-ads" rev="15.0.1" conf="api-&gt;default"/>
<dependency org="org.unimodules" name="unimodules-core" rev="2.0.1" conf="implementation-&gt;default"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
42e843a9a0dfd8461986c6d6cbafc770c91f2fb4
3448bff0633bfc4555f9790f501b0f477901c773
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>5.0.1</version>
</versions>
<lastUpdated>20190617131052</lastUpdated>
<lastUpdated>20190702091400</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>5.0.1</version>
</versions>
<lastUpdated>20190617131052</lastUpdated>
<lastUpdated>20190702091400</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
593117a4cbe54cb589b0d7c7112ce079
8f5a35ec7f563d6719e46e3132b4ccc2
Original file line number Diff line number Diff line change
@@ -1 +1 @@
318dcdf712c9fccc617a8c5ee40856e0b933ff3d
518ec740b7b5432dc6bde5480abbe522962cadf7
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#NOTE: This is an internal implementation file, its format can be changed without prior notice.
#Mon Jun 17 15:10:52 CEST 2019
maven-metadata-remote.xml.lastUpdated=1560777052524
#Tue Jul 02 11:14:00 CEST 2019
maven-metadata-remote.xml.lastUpdated=1562058840341
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
04ecd74e94a1843c6be93d0c86929602
0c8ff64b3dfefefdf49215cda47953c3
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bf059896558e0a37fe124dc42df9632a1bf5a80d
c9faec9e19ed88d285193dc22026b9f6a7faa59c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="host.exp.exponent" module="expo-ads-facebook" revision="5.0.1" status="integration" publication="20190617151058"/>
<info organisation="host.exp.exponent" module="expo-ads-facebook" revision="5.0.1" status="integration" publication="20190702111403"/>
<configurations>
<conf name="_internal_aapt2_binary" visibility="private" transitive="false"/>
<conf name="androidApis" visibility="public"/>
Expand Down Expand Up @@ -108,7 +108,7 @@
</publications>
<dependencies>
<dependency org="com.android.tools.build" name="aapt2" rev="3.3.2-5309881" conf="_internal_aapt2_binary-&gt;default">
<artifact name="aapt2" type="jar" ext="jar" m:classifier="osx" conf="_internal_aapt2_binary"/>
<artifact name="aapt2" type="jar" ext="jar" m:classifier="linux" conf="_internal_aapt2_binary"/>
</dependency>
<dependency org="com.facebook.android" name="audience-network-sdk" rev="5.1.1" conf="api-&gt;default"/>
<dependency org="org.unimodules" name="unimodules-core" rev="2.0.1" conf="implementation-&gt;default"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8e2de6856507649734765cfc947c0d676abd6ece
7e881dc03d869c9de3b46944ca8276a2ba7250b8
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>5.0.1</version>
</versions>
<lastUpdated>20190617131058</lastUpdated>
<lastUpdated>20190702091403</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>5.0.1</version>
</versions>
<lastUpdated>20190617131058</lastUpdated>
<lastUpdated>20190702091403</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
afe702a38ab160c11028c3106776184d
1da1150fe7007f75163d829650558465
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bd7fbb7179689eb0c41e3e18b1cdc127adc69a05
ccf57866be1aaf1c512ab2c00273ae927ce4e13f
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#NOTE: This is an internal implementation file, its format can be changed without prior notice.
#Mon Jun 17 15:10:58 CEST 2019
maven-metadata-remote.xml.lastUpdated=1560777058543
#Tue Jul 02 11:14:03 CEST 2019
maven-metadata-remote.xml.lastUpdated=1562058843113
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ca895f4f74f0446ef8160aeac0e7cf59
b2be6a3cc04e63184111fc81a19034d2
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b847ef24e521cd270f2003cd8ab3411b4553324f
10fff7e4f94cc2e5c4fd154f13cc018878a80e0f
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="host.exp.exponent" module="expo-analytics-amplitude" revision="5.0.1" status="integration" publication="20190617151103"/>
<info organisation="host.exp.exponent" module="expo-analytics-amplitude" revision="5.0.1" status="integration" publication="20190702111405"/>
<configurations>
<conf name="_internal_aapt2_binary" visibility="private" transitive="false"/>
<conf name="androidApis" visibility="public"/>
Expand Down Expand Up @@ -108,7 +108,7 @@
</publications>
<dependencies>
<dependency org="com.android.tools.build" name="aapt2" rev="3.3.2-5309881" conf="_internal_aapt2_binary-&gt;default">
<artifact name="aapt2" type="jar" ext="jar" m:classifier="osx" conf="_internal_aapt2_binary"/>
<artifact name="aapt2" type="jar" ext="jar" m:classifier="linux" conf="_internal_aapt2_binary"/>
</dependency>
<dependency org="com.amplitude" name="android-sdk" rev="2.9.2" conf="api-&gt;default"/>
<dependency org="org.unimodules" name="unimodules-core" rev="2.0.1" conf="implementation-&gt;default"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6cc8490aa29642e7f4be4d4852cfdc97fb0593e7
4d0a7fa50081736358f9bef0d9862735567170fd
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>5.0.1</version>
</versions>
<lastUpdated>20190617131104</lastUpdated>
<lastUpdated>20190702091405</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>5.0.1</version>
</versions>
<lastUpdated>20190617131104</lastUpdated>
<lastUpdated>20190702091405</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9c33acbb83e3215b01fcd9f926af8313
2014fd68ba2ec14fd8eef1eb74ddc32c
Original file line number Diff line number Diff line change
@@ -1 +1 @@
326a7629aa68714976b75b5647b9468aa6efba2a
cf04739559dbd41780448bc2ab0327520957150b
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#NOTE: This is an internal implementation file, its format can be changed without prior notice.
#Mon Jun 17 15:11:04 CEST 2019
maven-metadata-remote.xml.lastUpdated=1560777064022
#Tue Jul 02 11:14:05 CEST 2019
maven-metadata-remote.xml.lastUpdated=1562058845708
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4b38e6d20e19828bc3bc571730350a24
c35795d4eec82f4c03bc43c4e36a8231
Original file line number Diff line number Diff line change
@@ -1 +1 @@
42932b5c0f35d422f4315d929ea55a586a065b24
79aa08e5d140bff381109f11c528909d03f63d35
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="host.exp.exponent" module="expo-analytics-segment" revision="5.0.1" status="integration" publication="20190617151109"/>
<info organisation="host.exp.exponent" module="expo-analytics-segment" revision="5.0.1" status="integration" publication="20190702111408"/>
<configurations>
<conf name="_internal_aapt2_binary" visibility="private" transitive="false"/>
<conf name="androidApis" visibility="public"/>
Expand Down Expand Up @@ -108,7 +108,7 @@
</publications>
<dependencies>
<dependency org="com.android.tools.build" name="aapt2" rev="3.3.2-5309881" conf="_internal_aapt2_binary-&gt;default">
<artifact name="aapt2" type="jar" ext="jar" m:classifier="osx" conf="_internal_aapt2_binary"/>
<artifact name="aapt2" type="jar" ext="jar" m:classifier="linux" conf="_internal_aapt2_binary"/>
</dependency>
<dependency org="org.unimodules" name="unimodules-core" rev="2.0.1" conf="implementation-&gt;default"/>
<dependency org="org.unimodules" name="unimodules-constants-interface" rev="2.0.1" conf="implementation-&gt;default"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
afe88058dd5f08caa29a95d73cce963a4febcd63
318567a98389bcd816a5e741c6a2f7a6801435d9
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>5.0.1</version>
</versions>
<lastUpdated>20190617131109</lastUpdated>
<lastUpdated>20190702091408</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>5.0.1</version>
</versions>
<lastUpdated>20190617131109</lastUpdated>
<lastUpdated>20190702091408</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8d6a9c58392ba9a2de1e2dbbe147424e
da9121e718a846b6dee283fcefe0e7b3
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a8c72fec3c86975afb49b36df3cce76448377e14
49b75a563dd1abd2067355382d60e2fb6ab1a181
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#NOTE: This is an internal implementation file, its format can be changed without prior notice.
#Mon Jun 17 15:11:09 CEST 2019
maven-metadata-remote.xml.lastUpdated=1560777069785
#Tue Jul 02 11:14:08 CEST 2019
maven-metadata-remote.xml.lastUpdated=1562058848949
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e24fda7ed5607f578f859d427a4ecdfb
6f5db845e47ed319339c4e65fc994ee5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bff45aa6cf13ffca57a0c38842c5033b166fb824
4e44900c17a446fb021311e03fa4a8a1149ed59c
Loading

0 comments on commit 112f447

Please sign in to comment.