build: update build tools, support libs version.

multisite^2
Floens 8 years ago
parent 8549c6898c
commit a02c70d656
  1. 40
      Clover/app/build.gradle
  2. 4
      Clover/build.gradle
  3. 4
      Clover/gradle/wrapper/gradle-wrapper.properties

@ -15,7 +15,7 @@ def getCommitHash = { ->
android { android {
compileSdkVersion 25 compileSdkVersion 25
// update the travis config when changing this // update the travis config when changing this
buildToolsVersion '25.0.2' buildToolsVersion '26.0.2'
defaultConfig { defaultConfig {
minSdkVersion 15 minSdkVersion 15
@ -68,10 +68,12 @@ android {
} }
defaultPublishConfig "default" defaultPublishConfig "default"
flavorDimensions "default"
productFlavors { productFlavors {
// The app name refers to the name as displayed on the launcher. // The app name refers to the name as displayed on the launcher.
// the flavor name is appended to the name in the settings. // the flavor name is appended to the name in the settings.
"default" { "default" {
dimension "default"
applicationId "org.floens.chan" applicationId "org.floens.chan"
resValue "string", "app_name", "Clover" resValue "string", "app_name", "Clover"
resValue "string", "app_flavor_name", "" resValue "string", "app_flavor_name", ""
@ -79,6 +81,7 @@ android {
} }
dev { dev {
dimension "default"
applicationId "org.floens.chan.dev" applicationId "org.floens.chan.dev"
resValue "string", "app_name", "Clover dev" resValue "string", "app_name", "Clover dev"
resValue "string", "app_flavor_name", "" resValue "string", "app_flavor_name", ""
@ -86,6 +89,7 @@ android {
} }
fdroid { fdroid {
dimension "default"
applicationId "org.floens.chan" applicationId "org.floens.chan"
resValue "string", "app_name", "Clover" resValue "string", "app_name", "Clover"
resValue "string", "app_flavor_name", "F-Droid" resValue "string", "app_flavor_name", "F-Droid"
@ -115,20 +119,22 @@ android {
} }
dependencies { dependencies {
compile 'com.android.support:support-v13:25.3.1' def supportVersion = '25.4.0'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:recyclerview-v7:25.3.1' implementation "com.android.support:support-v13:${supportVersion}"
compile 'com.android.support:cardview-v7:25.3.1' implementation "com.android.support:appcompat-v7:${supportVersion}"
compile 'com.android.support:support-annotations:25.3.1' implementation "com.android.support:recyclerview-v7:${supportVersion}"
compile 'com.android.support:design:25.3.1' implementation "com.android.support:cardview-v7:${supportVersion}"
compile 'com.android.support:customtabs:25.3.1' implementation "com.android.support:support-annotations:${supportVersion}"
implementation "com.android.support:design:${supportVersion}"
compile 'org.jsoup:jsoup:1.9.2' implementation "com.android.support:customtabs:${supportVersion}"
compile 'com.j256.ormlite:ormlite-core:4.48'
compile 'com.j256.ormlite:ormlite-android:4.48' implementation 'com.squareup.okhttp3:okhttp:3.8.0'
compile 'pl.droidsonroids.gif:android-gif-drawable:1.1.16' implementation 'com.j256.ormlite:ormlite-core:4.48'
compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0' implementation 'com.j256.ormlite:ormlite-android:4.48'
compile 'com.squareup.okhttp3:okhttp:3.4.1' implementation 'org.jsoup:jsoup:1.9.2'
compile 'de.greenrobot:eventbus:2.4.0' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.1.16'
compile 'org.nibor.autolink:autolink:0.6.0' implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0'
implementation 'de.greenrobot:eventbus:2.4.0'
implementation 'org.nibor.autolink:autolink:0.6.0'
} }

@ -1,15 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
repositories { repositories {
google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.0'
} }
} }
allprojects { allprojects {
repositories { repositories {
google()
jcenter() jcenter()
} }
} }

@ -1,6 +1,6 @@
#Tue Mar 07 00:32:11 EST 2017 #Tue Oct 31 23:48:24 CET 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

Loading…
Cancel
Save