Merge pull request #3975 from hannesa2/AndroidStudio3.1.2
update to Android Studio 3.1.2
This commit is contained in:
commit
9997a33524
4 changed files with 9 additions and 18 deletions
|
@ -3,7 +3,7 @@ apply plugin: 'realm-android'
|
|||
|
||||
android {
|
||||
compileSdkVersion 27
|
||||
buildToolsVersion '26.0.2'
|
||||
buildToolsVersion '27.0.3'
|
||||
defaultConfig {
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 27
|
||||
|
@ -39,7 +39,7 @@ buildscript {
|
|||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.0.1'
|
||||
classpath 'com.android.tools.build:gradle:3.1.2'
|
||||
//classpath 'io.realm:realm-gradle-plugin:0.88.2'
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
|
|
@ -5,7 +5,7 @@ apply plugin: 'maven'
|
|||
|
||||
android {
|
||||
compileSdkVersion 27
|
||||
buildToolsVersion '26.0.2'
|
||||
buildToolsVersion '27.0.3'
|
||||
// resourcePrefix 'mpcht'
|
||||
defaultConfig {
|
||||
minSdkVersion 9
|
||||
|
@ -34,11 +34,9 @@ repositories {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
//compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||
//compile 'com.android.support:support-v4:19.+'
|
||||
//provided 'io.realm:realm-android:0.87.5' // "optional" dependency to realm-database API
|
||||
testCompile 'junit:junit:4.12'
|
||||
testCompile "org.mockito:mockito-core:1.10.19"
|
||||
testImplementation 'junit:junit:4.12'
|
||||
testImplementation "org.mockito:mockito-core:1.10.19"
|
||||
}
|
||||
|
||||
android.libraryVariants.all { variant ->
|
||||
|
|
11
build.gradle
11
build.gradle
|
@ -1,7 +1,3 @@
|
|||
//task wrapper(type: Wrapper) {
|
||||
// gradleVersion = '2.9'
|
||||
//}
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
|
@ -9,7 +5,7 @@ buildscript {
|
|||
}
|
||||
dependencies {
|
||||
classpath "io.realm:realm-gradle-plugin:4.2.0"
|
||||
classpath 'com.android.tools.build:gradle:3.0.1'
|
||||
classpath 'com.android.tools.build:gradle:3.1.2'
|
||||
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
|
||||
}
|
||||
}
|
||||
|
@ -17,9 +13,6 @@ buildscript {
|
|||
allprojects {
|
||||
repositories {
|
||||
jcenter()
|
||||
maven {
|
||||
url 'https://maven.google.com/'
|
||||
name 'Google'
|
||||
}
|
||||
google()
|
||||
}
|
||||
}
|
||||
|
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
|||
#Mon Nov 20 11:59:54 CET 2017
|
||||
#Wed Apr 25 08:04:33 CEST 2018
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
|
||||
|
|
Loading…
Add table
Reference in a new issue