Skip to content

Commit b356041

Browse files
author
Abner Oliveira
committed
changes to fix the package to get the jsc-cppruntime from an early version which contains the libc++_shared.so
1 parent 8f11913 commit b356041

File tree

3 files changed

+37
-11
lines changed

3 files changed

+37
-11
lines changed

download-jsc/build.gradle

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,22 @@ apply plugin: 'java'
1919

2020
task downloadJsc(type: Download) {
2121

22+
src 'https://registry.npmjs.org/jsc-android/-/jsc-android-245459.0.0.tgz'
23+
dest new File("${projectDir}/jsc-download-package")
24+
connectTimeout 25000
25+
onlyIfNewer true
26+
doLast {
27+
28+
copy {
29+
from tarTree(resources.gzip(new File("${projectDir}/jsc-download-package/jsc-android-245459.0.0.tgz")))
30+
into "${getProjectDir()}/libs/245459.0.0"
31+
32+
}
33+
}
34+
}
35+
36+
task downloadJscNewest(type: Download) {
37+
2238
src 'https://registry.npmjs.org/jsc-android/-/jsc-android-250230.2.1.tgz'
2339
dest new File("${projectDir}/jsc-download-package")
2440
connectTimeout 25000
@@ -27,14 +43,16 @@ task downloadJsc(type: Download) {
2743

2844
copy {
2945
from tarTree(resources.gzip(new File("${projectDir}/jsc-download-package/jsc-android-250230.2.1.tgz")))
30-
into "${getProjectDir()}/libs"
46+
into "${getProjectDir()}/libs/250230.2.1"
3147

3248
}
3349
}
3450
}
3551

3652
build.dependsOn downloadJsc
3753

54+
downloadJsc.dependsOn downloadJscNewest
55+
3856

3957
task replaceAndroidJsc(type: Copy) {
4058
from file('${project.rootDir}/jsc/build.gradle')

jsc-intl/build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ repositories {
1818
jcenter()
1919
maven {
2020
// Local Maven repo containing AARs with JSC library built for Android
21-
url "$projectDir/../download-jsc/libs/package/dist"
21+
url "$projectDir/../download-jsc/libs/245459.0.0/package/dist"
22+
}
23+
maven {
24+
// Local Maven repo containing AARs with JSC library built for Android
25+
url "$projectDir/../download-jsc/libs/250230.2.1/package/dist"
2226
}
2327
}
2428

@@ -43,6 +47,6 @@ android {
4347
}
4448

4549
dependencies {
46-
embed "org.webkit:android-jsc-intl:+"
47-
embed "org.webkit:android-jsc-cppruntime:+"
50+
embed "org.webkit:android-jsc-intl:r250230"
51+
embed "org.webkit:android-jsc-cppruntime:r245459"
4852
}

jsc/build.gradle

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,22 @@ repositories {
1818
jcenter()
1919
maven {
2020
// Local Maven repo containing AARs with JSC library built for Android
21-
url "$projectDir/../download-jsc/libs/package/dist"
21+
url "$projectDir/../download-jsc/libs/245459.0.0/package/dist"
22+
}
23+
maven {
24+
// Local Maven repo containing AARs with JSC library built for Android
25+
url "$projectDir/../download-jsc/libs/250230.2.1/package/dist"
2226
}
2327
}
2428

2529
apply plugin: 'com.kezong.fat-aar'
2630

2731
android {
2832

29-
// packagingOptions {
30-
// pickFirst '**/libjsc.so'
31-
// pickFirst '**/libc++_shared.so'
32-
// }
33+
packagingOptions {
34+
pickFirst '**/libjsc.so'
35+
pickFirst '**/libc++_shared.so'
36+
}
3337

3438
defaultConfig {
3539
externalNativeBuild {
@@ -44,6 +48,6 @@ android {
4448
}
4549

4650
dependencies {
47-
embed "org.webkit:android-jsc:+"
48-
embed "org.webkit:android-jsc-cppruntime:+"
51+
embed "org.webkit:android-jsc:r250230"
52+
embed "org.webkit:android-jsc-cppruntime:r245459"
4953
}

0 commit comments

Comments
 (0)