Skip to content

Commit 0b591ad

Browse files
authored
Merge pull request #4 from shilangyu/bump-jsc-intl
Bump JSC intl version
2 parents b356041 + d454d26 commit 0b591ad

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group 'io.abner.fastdev.android'
2-
version '0.1.8'
2+
version '0.2.0'
33

44
buildscript {
55
repositories {

download-jsc/build.gradle

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,28 @@ task downloadJscNewest(type: Download) {
4949
}
5050
}
5151

52+
task downloadJscNewestIntl(type: Download) {
53+
54+
src 'https://registry.npmjs.org/jsc-android/-/jsc-android-294992.0.0.tgz'
55+
dest new File("${projectDir}/jsc-download-package")
56+
connectTimeout 25000
57+
onlyIfNewer true
58+
doLast {
59+
60+
copy {
61+
from tarTree(resources.gzip(new File("${projectDir}/jsc-download-package/jsc-android-294992.0.0.tgz")))
62+
into "${getProjectDir()}/libs/294992.0.0"
63+
64+
}
65+
}
66+
}
67+
5268
build.dependsOn downloadJsc
5369

5470
downloadJsc.dependsOn downloadJscNewest
5571

72+
downloadJsc.dependsOn downloadJscNewestIntl
73+
5674

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

jsc-intl/build.gradle

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,15 @@ buildscript {
1616
repositories {
1717
google()
1818
jcenter()
19-
maven {
20-
// Local Maven repo containing AARs with JSC library built for Android
21-
url "$projectDir/../download-jsc/libs/245459.0.0/package/dist"
22-
}
2319
maven {
2420
// Local Maven repo containing AARs with JSC library built for Android
25-
url "$projectDir/../download-jsc/libs/250230.2.1/package/dist"
21+
url "$projectDir/../download-jsc/libs/294992.0.0/package/dist"
2622
}
2723
}
2824

2925
apply plugin: 'com.kezong.fat-aar'
3026

3127
android {
32-
33-
// packagingOptions {
34-
// pickFirst '**/libjsc.so'
35-
// pickFirst '**/libc++_shared.so'
36-
// }
3728
defaultConfig {
3829
externalNativeBuild {
3930
cmake {
@@ -47,6 +38,5 @@ android {
4738
}
4839

4940
dependencies {
50-
embed "org.webkit:android-jsc-intl:r250230"
51-
embed "org.webkit:android-jsc-cppruntime:r245459"
41+
embed "org.webkit:android-jsc-intl:r294992"
5242
}

0 commit comments

Comments
 (0)