Skip to content

Commit

Permalink
update project version, dependencies, gradle version and target SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
Cliffus committed Oct 11, 2017
1 parent 72f2645 commit 6224d03
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 18 deletions.
11 changes: 5 additions & 6 deletions app/build.gradle
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
buildToolsVersion "23.0.3"
compileSdkVersion 26
buildToolsVersion "26.0.2"

defaultConfig {
applicationId "blogc.at.android.views"
minSdkVersion 14
targetSdkVersion 24
targetSdkVersion 26
versionCode 1
versionName "1.0.0"
}
Expand All @@ -21,9 +21,8 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:24.1.1'

compile 'com.android.support:support-annotations:24.1.1'
compile 'com.android.support:appcompat-v7:26.0.0-alpha1'
compile 'com.android.support:support-annotations:25.3.1'
compile project(':expandabletextview')

testCompile 'junit:junit:4.12'
Expand Down
8 changes: 3 additions & 5 deletions build.gradle
Expand Up @@ -5,11 +5,9 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.0.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
}
}

Expand Down
10 changes: 5 additions & 5 deletions expandabletextview/build.gradle
Expand Up @@ -2,18 +2,18 @@ apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'

def fullVersion = '1.0.3'
def fullVersion = '1.0.4'

group = 'at.blogc'
version = fullVersion

android {
compileSdkVersion 24
buildToolsVersion "23.0.3"
compileSdkVersion 26
buildToolsVersion "26.0.2"

defaultConfig {
minSdkVersion 14
targetSdkVersion 24
targetSdkVersion 26
versionCode 1
versionName fullVersion

Expand All @@ -33,7 +33,7 @@ repositories {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-annotations:24.1.1'
compile 'com.android.support:support-annotations:25.3.1'

testCompile 'junit:junit:4.12'
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Mon Dec 28 10:00:20 PST 2015
#Wed Oct 11 14:19:54 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip

0 comments on commit 6224d03

Please sign in to comment.