From 0aebf693761dd38c7edffa77b655063832a6bff5 Mon Sep 17 00:00:00 2001 From: shilangyu Date: Wed, 26 Oct 2022 09:38:21 +0200 Subject: [PATCH 1/3] Bump JSC intl version, remove cppruntime --- jsc-intl/build.gradle | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/jsc-intl/build.gradle b/jsc-intl/build.gradle index a2b664a..bbd5a82 100644 --- a/jsc-intl/build.gradle +++ b/jsc-intl/build.gradle @@ -16,24 +16,15 @@ buildscript { repositories { google() jcenter() - maven { - // Local Maven repo containing AARs with JSC library built for Android - url "$projectDir/../download-jsc/libs/245459.0.0/package/dist" - } maven { // Local Maven repo containing AARs with JSC library built for Android - url "$projectDir/../download-jsc/libs/250230.2.1/package/dist" + url "$projectDir/../download-jsc/libs/294992.0.0/package/dist" } } apply plugin: 'com.kezong.fat-aar' android { - -// packagingOptions { -// pickFirst '**/libjsc.so' -// pickFirst '**/libc++_shared.so' -// } defaultConfig { externalNativeBuild { cmake { @@ -47,6 +38,5 @@ android { } dependencies { - embed "org.webkit:android-jsc-intl:r250230" - embed "org.webkit:android-jsc-cppruntime:r245459" + embed "org.webkit:android-jsc-intl:r294992" } From f0564a9a9c9869f36904c17f81f062de03b5e7e2 Mon Sep 17 00:00:00 2001 From: shilangyu Date: Wed, 26 Oct 2022 09:46:22 +0200 Subject: [PATCH 2/3] Download newest intl version --- download-jsc/build.gradle | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/download-jsc/build.gradle b/download-jsc/build.gradle index 05bb435..58c6c61 100644 --- a/download-jsc/build.gradle +++ b/download-jsc/build.gradle @@ -49,10 +49,28 @@ task downloadJscNewest(type: Download) { } } +task downloadJscNewestIntl(type: Download) { + + src 'https://registry.npmjs.org/jsc-android/-/jsc-android-294992.0.0.tgz' + dest new File("${projectDir}/jsc-download-package") + connectTimeout 25000 + onlyIfNewer true + doLast { + + copy { + from tarTree(resources.gzip(new File("${projectDir}/jsc-download-package/jsc-android-294992.0.0.tgz"))) + into "${getProjectDir()}/libs/294992.0.0" + + } + } +} + build.dependsOn downloadJsc downloadJsc.dependsOn downloadJscNewest +downloadJsc.dependsOn downloadJscNewestIntl + task replaceAndroidJsc(type: Copy) { from file('${project.rootDir}/jsc/build.gradle') From d454d2684c1fb098de8b4d4aab42cf5f65ca450d Mon Sep 17 00:00:00 2001 From: shilangyu Date: Wed, 26 Oct 2022 09:46:28 +0200 Subject: [PATCH 3/3] Bump version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7c73f20..7ed2bf4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'io.abner.fastdev.android' -version '0.1.8' +version '0.2.0' buildscript { repositories {