Skip to content

Commit

Permalink
update to Android Studio 3.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
hannesa2 committed Apr 28, 2018
1 parent 984e05f commit 07d0549
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 18 deletions.
4 changes: 2 additions & 2 deletions MPChartExample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'realm-android'

android {
compileSdkVersion 27
buildToolsVersion '26.0.2'
buildToolsVersion '27.0.3'
defaultConfig {
minSdkVersion 16
targetSdkVersion 27
Expand Down Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions MPChartLib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apply plugin: 'maven'

android {
compileSdkVersion 27
buildToolsVersion '26.0.2'
buildToolsVersion '27.0.3'
// resourcePrefix 'mpcht'
defaultConfig {
minSdkVersion 9
Expand Down Expand Up @@ -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 ->
Expand Down
11 changes: 2 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
//task wrapper(type: Wrapper) {
// gradleVersion = '2.9'
//}

buildscript {
repositories {
jcenter()
google()
}
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'
}
}

allprojects {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
}
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 07d0549

Please sign in to comment.