mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-11-05 13:26:48 +08:00
chore: support for build with java10 (#130)
This commit is contained in:
committed by
Manol Donev
parent
1ed68d47ed
commit
7ecec4cdc7
@@ -2,10 +2,11 @@
|
|||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
|
google()
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:2.3.1'
|
classpath 'com.android.tools.build:gradle:3.1.3'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
@@ -14,6 +15,7 @@ buildscript {
|
|||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
repositories {
|
repositories {
|
||||||
|
google()
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,3 +16,8 @@
|
|||||||
# This option should only be used with decoupled projects. More details, visit
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
# org.gradle.parallel=true
|
# org.gradle.parallel=true
|
||||||
|
|
||||||
|
# Due to a known issue with Android Gradle Plugin versions 3.0.* and 3.1.*,
|
||||||
|
# the configuration on demand should be disabled.
|
||||||
|
# https://developer.android.com/studio/known-issues
|
||||||
|
org.gradle.configureondemand=false
|
||||||
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
|||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ def computeCompileSdkVersion () {
|
|||||||
return compileSdk
|
return compileSdk
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return 25
|
return 27
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -20,7 +20,16 @@ def computeBuildToolsVersion() {
|
|||||||
return buildToolsVersion
|
return buildToolsVersion
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return "25.0.2"
|
return "27.0.3"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def computeSupportVersion() {
|
||||||
|
if(project.hasProperty("supportVersion")) {
|
||||||
|
return supportVersion
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return "27.1.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,7 +38,7 @@ def computeTargetSdkVersion() {
|
|||||||
return targetSdk
|
return targetSdk
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return 25
|
return 27
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,7 +62,7 @@ android {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(include: ['*.jar'], dir: 'libs')
|
compile fileTree(include: ['*.jar'], dir: 'libs')
|
||||||
compile 'com.android.support:support-v4:+'
|
compile 'com.android.support:support-v4:' + computeSupportVersion()
|
||||||
}
|
}
|
||||||
|
|
||||||
task cleanBuildDir (type: Delete) {
|
task cleanBuildDir (type: Delete) {
|
||||||
|
|||||||
Reference in New Issue
Block a user