Skip to content

Commit cfed201

Browse files
committed
upgrade javascriptcore versions. bump gradle and android plugin
1 parent 0b591ad commit cfed201

File tree

6 files changed

+48
-53
lines changed

6 files changed

+48
-53
lines changed

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
group 'io.abner.fastdev.android'
2-
version '0.2.0'
2+
version '0.3.0'
33

44
buildscript {
55
repositories {
6+
gradlePluginPortal()
67
google()
78
jcenter()
89
}
910

1011
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.5.0'
12+
classpath 'com.android.tools.build:gradle:7.1.3'
1213
}
1314
}
1415

download-jsc/build.gradle

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ version '1.0.0'
44
buildscript {
55
repositories {
66
google()
7-
jcenter()
87
}
98

109
dependencies {
1110
classpath "de.undercouch:gradle-download-task:4.1.1"
12-
classpath 'com.kezong:fat-aar:1.2.15'
11+
classpath 'com.github.kezong:fat-aar:1.2.15'
1312
}
1413
}
1514

@@ -19,37 +18,21 @@ apply plugin: 'java'
1918

2019
task downloadJsc(type: Download) {
2120

22-
src 'https://registry.npmjs.org/jsc-android/-/jsc-android-245459.0.0.tgz'
21+
src 'https://registry.npmjs.org/jsc-android/-/jsc-android-250231.0.0.tgz'
2322
dest new File("${projectDir}/jsc-download-package")
2423
connectTimeout 25000
2524
onlyIfNewer true
2625
doLast {
2726

2827
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"
28+
from tarTree(resources.gzip(new File("${projectDir}/jsc-download-package/jsc-android-250231.0.0.tgz")))
29+
into "${getProjectDir()}/libs/250231.0.0"
3130

3231
}
3332
}
3433
}
3534

36-
task downloadJscNewest(type: Download) {
37-
38-
src 'https://registry.npmjs.org/jsc-android/-/jsc-android-250230.2.1.tgz'
39-
dest new File("${projectDir}/jsc-download-package")
40-
connectTimeout 25000
41-
onlyIfNewer true
42-
doLast {
43-
44-
copy {
45-
from tarTree(resources.gzip(new File("${projectDir}/jsc-download-package/jsc-android-250230.2.1.tgz")))
46-
into "${getProjectDir()}/libs/250230.2.1"
47-
48-
}
49-
}
50-
}
51-
52-
task downloadJscNewestIntl(type: Download) {
35+
task downloadJscIntl(type: Download) {
5336

5437
src 'https://registry.npmjs.org/jsc-android/-/jsc-android-294992.0.0.tgz'
5538
dest new File("${projectDir}/jsc-download-package")
@@ -67,13 +50,6 @@ task downloadJscNewestIntl(type: Download) {
6750

6851
build.dependsOn downloadJsc
6952

70-
downloadJsc.dependsOn downloadJscNewest
71-
72-
downloadJsc.dependsOn downloadJscNewestIntl
53+
downloadJsc.dependsOn downloadJscIntl
7354

7455

75-
task replaceAndroidJsc(type: Copy) {
76-
from file('${project.rootDir}/jsc/build.gradle')
77-
into '${project.rootDir}/jsc/'
78-
filter { line -> line.replaceAll('/*ANDROID_JSC_DEPENDENCY*/', 'embed "org.webkit:android-jsc:+"') }
79-
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip

jsc-intl/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@ group 'io.abner.fastdev.android'
33

44
buildscript {
55
repositories {
6+
mavenCentral()
67
google()
7-
jcenter()
8+
maven { url "https://plugins.gradle.org/m2/" }
89
}
910

1011
dependencies {
11-
classpath 'com.kezong:fat-aar:1.2.15'
12+
classpath 'com.github.kezong:fat-aar:1.3.8'
1213
}
1314
}
1415

1516

1617
repositories {
18+
mavenCentral()
1719
google()
18-
jcenter()
19-
maven {
20+
maven {
2021
// Local Maven repo containing AARs with JSC library built for Android
2122
url "$projectDir/../download-jsc/libs/294992.0.0/package/dist"
2223
}

jsc/build.gradle

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,34 @@ group 'io.abner.fastdev.android'
33

44
buildscript {
55
repositories {
6+
mavenCentral()
67
google()
7-
jcenter()
8+
maven { url "https://plugins.gradle.org/m2/" }
89
}
910

1011
dependencies {
11-
classpath 'com.kezong:fat-aar:1.2.15'
12+
classpath 'com.github.kezong:fat-aar:1.3.8'
1213
}
1314
}
1415

1516

1617
repositories {
1718
google()
18-
jcenter()
19+
mavenCentral()
1920
maven {
2021
// Local Maven repo containing AARs with JSC library built for Android
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"
22+
url "$projectDir/../download-jsc/libs/250231.0.0/package/dist"
2623
}
2724
}
2825

2926
apply plugin: 'com.kezong.fat-aar'
3027

3128
android {
3229

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

3835
defaultConfig {
3936
externalNativeBuild {
@@ -48,6 +45,6 @@ android {
4845
}
4946

5047
dependencies {
51-
embed "org.webkit:android-jsc:r250230"
52-
embed "org.webkit:android-jsc-cppruntime:r245459"
48+
embed "org.webkit:android-jsc:r250231"
49+
embed "org.webkit:android-jsc-cppruntime:r250231"
5350
}

settings.gradle

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,22 @@
1-
rootProject.name = 'jsrt'
2-
include ":quickjs", ":jsc", ":jsc-intl"
1+
pluginManagement {
2+
3+
/**
4+
* The pluginManagement {repositories {...}} block configures the
5+
* repositories Gradle uses to search or download the Gradle plugins and
6+
* their transitive dependencies. Gradle pre-configures support for remote
7+
* repositories such as JCenter, Maven Central, and Ivy. You can also use
8+
* local repositories or define your own remote repositories. The code below
9+
* defines the Gradle Plugin Portal, Google's Maven repository,
10+
* and the Maven Central Repository as the repositories Gradle should use to look for its
11+
* dependencies.
12+
*/
13+
14+
repositories {
15+
gradlePluginPortal()
16+
google()
17+
mavenCentral()
18+
}
19+
}
20+
21+
rootProject.name = 'fast-development-android-js-runtimes'
22+
include ":quickjs", ":jsc", ":jsc-intl"

0 commit comments

Comments
 (0)