diff --git a/android/build.gradle b/android/build.gradle index dd4303bca..acfd3cd98 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -18,6 +18,7 @@ allprojects { repositories { google() jcenter() + maven { url "$rootDir/../node_modules/jsc-android/dist" } // React Native (JS, Obj-C sources, Android binaries) is installed from // npm. maven { url "$rootDir/../node_modules/react-native/android" } @@ -34,6 +35,12 @@ allprojects { def version = new groovy.json.JsonSlurper().parseText(file.text).version details.useVersion version } + if (details.requested.group == 'org.webkit' + && details.requested.name == 'android-jsc') { + def file = new File("$rootDir/../node_modules/jsc-android/package.json") + def version = new groovy.json.JsonSlurper().parseText(file.text).version + details.useVersion "r${version.tokenize('.')[0]}" + } } } } @@ -146,7 +153,7 @@ allprojects { ext { buildToolsVersion = "26.0.2" compileSdkVersion = 26 - minSdkVersion = 16 + minSdkVersion = 21 targetSdkVersion = 26 // The Maven artifact groupdId of the third-party react-native modules which diff --git a/package-lock.json b/package-lock.json index 04a71c301..b278e875d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9519,6 +9519,11 @@ "dev": true, "optional": true }, + "jsc-android": { + "version": "224109.1.0", + "resolved": "https://registry.npmjs.org/jsc-android/-/jsc-android-224109.1.0.tgz", + "integrity": "sha512-mhALFynePc/wJsUt9BJuH13mSK/dGWtBO/pcYwVV1I0A7iduyqy3fSoAt1b0yI+/B3TzlGyue/gqjPxsqG1HRQ==" + }, "jsesc": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", diff --git a/package.json b/package.json index 2f625232f..098b66ad1 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "jquery-contextmenu": "2.4.5", "jquery-i18next": "1.2.0", "js-md5": "0.6.1", + "jsc-android": "224109.1.0", "jwt-decode": "2.2.0", "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#2be752fc88ff71e454c6b9178b21a33b59c53f41", "lodash": "4.17.4",