Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update targetSDK, buildTools, support library and maven plugin #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update targetSDK, buildTools, support library and maven plugin #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion udark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'org.robolectric:robolectric-gradle-plugin:1.1.0'
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5"

Expand Down
4 changes: 2 additions & 2 deletions udark/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Jan 09 19:22:18 MSK 2016
#Sat Dec 24 12:46:35 EET 2016
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-2.14.1-all.zip
8 changes: 4 additions & 4 deletions udark/udapp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 25
buildToolsVersion "25.0.2"

defaultConfig {
applicationId "io.underdark.app"
minSdkVersion 16
targetSdkVersion 22
targetSdkVersion 24
versionCode 1
versionName "1.0"

Expand All @@ -32,7 +32,7 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
//compile(name:'underdark-release', ext:'aar')
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:appcompat-v7:25.1.0'
compile project(':underdark')
compile 'org.slf4j:slf4j-api:1.7.12'
}
8 changes: 4 additions & 4 deletions udark/underdark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'

//classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5"
}
}

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 25
buildToolsVersion "25.0.2"
resourcePrefix "underdark__"

// http://stackoverflow.com/a/24910671/1449965
Expand All @@ -39,7 +39,7 @@ android {

defaultConfig {
minSdkVersion 16
targetSdkVersion 22
targetSdkVersion 24
versionCode ud_versionCode
versionName ud_version
}
Expand Down