Skip to content

Commit

Permalink
update support library and version of android sdk to 28. update gradle.
Browse files Browse the repository at this point in the history
  • Loading branch information
bkhezry committed Nov 7, 2018
1 parent 2b86f82 commit da58dbf
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 82 deletions.
Binary file added .idea/caches/build_file_checksums.ser
Binary file not shown.
Binary file added .idea/caches/gradle_models.ser
Binary file not shown.
16 changes: 16 additions & 0 deletions .idea/checkstyle-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 0 additions & 22 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

10 changes: 3 additions & 7 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 1 addition & 38 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 28
buildToolsVersion "28.0.3"
defaultConfig {
applicationId "com.github.bkhezry.demomapdrawingtools"
minSdkVersion 17
targetSdkVersion 25
targetSdkVersion 28
versionCode 110
versionName "1.1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -25,7 +25,7 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})

def SupportLibVersion = '25.3.1'
def SupportLibVersion = '28.0.0'
compile "com.android.support:appcompat-v7:$SupportLibVersion",
"com.android.support:design:$SupportLibVersion"
compile ('com.github.bkhezry:ExtraMapUtils:v1.2.0'){
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.android.tools.build:gradle:3.4.0-alpha02'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -16,6 +17,7 @@ allprojects {
repositories {
jcenter()
maven { url "https://jitpack.io" }
google()
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
10 changes: 5 additions & 5 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 28
buildToolsVersion "28.0.3"

defaultConfig {
minSdkVersion 17
targetSdkVersion 25
targetSdkVersion 28
versionCode 110
versionName "1.1.0"

Expand All @@ -27,11 +27,11 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
def SupportLibVersion = '25.3.1'
def SupportLibVersion = '28.0.0'
compile "com.android.support:appcompat-v7:$SupportLibVersion",
"com.android.support:design:$SupportLibVersion"

def playServicesVersion = '10.2.1'
def playServicesVersion = '16.0.0'
compile "com.google.android.gms:play-services-maps:$playServicesVersion",
"com.google.android.gms:play-services-location:$playServicesVersion"

Expand Down

0 comments on commit da58dbf

Please sign in to comment.