Update dependencies

This commit is contained in:
Jan-Lk Else 2017-09-13 21:10:31 +02:00
parent ad5be8ed47
commit a38e7a90f0
7 changed files with 24 additions and 22 deletions

View File

@ -3,13 +3,13 @@ apply plugin: 'kotlin-android'
android {
compileSdkVersion 26
buildToolsVersion "26.0.0"
buildToolsVersion "26.0.1"
defaultConfig {
applicationId "telegra.ph"
minSdkVersion 15
targetSdkVersion 26
versionCode 9
versionName "1.3.0"
versionCode 10
versionName "1.3.1"
resConfigs "en"
}
buildTypes {
@ -27,15 +27,15 @@ android {
}
dependencies {
compile 'com.android.support:appcompat-v7:25.4.0'
compile 'com.android.support:recyclerview-v7:25.4.0'
compile 'com.android.support:support-v13:25.4.0'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile 'com.github.delight-im:Android-AdvancedWebView:v3.0.0'
compile 'com.afollestad.material-dialogs:core:0.9.4.5'
compile 'com.afollestad.material-dialogs:commons:0.9.4.5'
compile 'pub.devrel:easypermissions:0.4.2'
compile('com.afollestad:bridge:5.1.2') {
implementation 'com.android.support:appcompat-v7:26.0.2'
implementation 'com.android.support:recyclerview-v7:26.0.2'
implementation 'com.android.support:support-v13:26.0.2'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'com.github.delight-im:Android-AdvancedWebView:v3.0.0'
implementation 'com.afollestad.material-dialogs:core:0.9.4.7'
implementation 'com.afollestad.material-dialogs:commons:0.9.4.7'
implementation 'pub.devrel:easypermissions:1.0.0'
implementation('com.afollestad:bridge:5.1.2') {
exclude group: 'org.json', module: 'json'
exclude group: 'com.intellij', module: 'annotations'
}

View File

@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.1.3-2'
ext.kotlin_version = '1.1.4-3'
repositories {
jcenter()
mavenCentral()
maven { url "https://maven.google.com" }
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.0.0-beta5'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
@ -19,7 +19,7 @@ allprojects {
repositories {
jcenter()
mavenCentral()
google()
maven { url "https://jitpack.io" }
maven { url "https://maven.google.com" }
}
}

View File

@ -1,4 +1,6 @@
kotlin.incremental=true
org.gradle.parallel=true
org.gradle.configureondemand=true
org.gradle.jvmargs=-Xmx3072M
org.gradle.jvmargs=-Xmx3072M
android.enableD8=true
android.enableAapt2=false

Binary file not shown.

View File

@ -1,6 +1,6 @@
#Fri Jul 14 20:42:12 CEST 2017
#Wed Sep 13 20:51:10 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

6
gradlew vendored
View File

@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn ( ) {
warn () {
echo "$*"
}
die ( ) {
die () {
echo
echo "$*"
echo
@ -155,7 +155,7 @@ if $cygwin ; then
fi
# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}

0
gradlew.bat vendored Normal file → Executable file
View File