Skip to content

Commit

Permalink
Update gradle and compile|target SDK to 28
Browse files Browse the repository at this point in the history
  • Loading branch information
Jared Rummler committed Oct 29, 2018
1 parent 4a20a78 commit 9743dac
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 140 deletions.
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.1.1"
}
}

allprojects {
repositories {
google()
jcenter()
maven {
url 'https://maven.google.com'
}
}
}

Expand Down
10 changes: 5 additions & 5 deletions demo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion "26.0.1"
compileSdkVersion 28
buildToolsVersion '28.0.3'

defaultConfig {
applicationId "com.jaredrummler.android.animatedsvgview.demo"
minSdkVersion 14
targetSdkVersion 26
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
Expand All @@ -20,6 +20,6 @@ android {
}

dependencies {
compile 'com.android.support:appcompat-v7:26.0.2'
compile project(':library')
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation project(':library')
}
123 changes: 0 additions & 123 deletions gradle/artifactory-push.gradle

This file was deleted.

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 @@
#Sat May 06 14:50:12 PDT 2017
#Sun Oct 28 21:03:42 PDT 2018
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.6-all.zip
11 changes: 5 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 26
buildToolsVersion "26.0.1"
compileSdkVersion 28
buildToolsVersion '28.0.3'

defaultConfig {
minSdkVersion 14
targetSdkVersion 26
targetSdkVersion 28
}
}

dependencies {
compile 'com.android.support:support-compat:26.0.2'
implementation 'com.android.support:support-compat:28.0.0'
}

apply from: rootProject.file('gradle/maven-push.gradle')
//apply from: rootProject.file('gradle/artifactory-push.gradle')
apply from: rootProject.file('gradle/maven-push.gradle')

0 comments on commit 9743dac

Please sign in to comment.