diff --git a/app/build.gradle b/app/build.gradle index 4f0a285..d4446ab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,14 +2,14 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.0" defaultConfig { applicationId "telegra.ph" minSdkVersion 15 - targetSdkVersion 25 - versionCode 7 - versionName "1.1.1" + targetSdkVersion 26 + versionCode 8 + versionName "1.2.0" resConfigs "en" } buildTypes { @@ -27,11 +27,14 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:25.1.0' - compile 'com.android.support:recyclerview-v7:25.1.0' - compile 'com.android.support:support-v13:25.1.0' + 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.1.0' - compile 'com.afollestad:bridge:3.3.0' + compile 'com.afollestad.material-dialogs:core:0.9.4.5' + compile('com.afollestad:bridge:5.1.2') { + exclude group: 'org.json', module: 'json' + exclude group: 'com.intellij', module: 'annotations' + } } diff --git a/app/src/main/assets/editor.html b/app/src/main/assets/editor.html index 363a5ee..16e5850 100644 --- a/app/src/main/assets/editor.html +++ b/app/src/main/assets/editor.html @@ -12,7 +12,7 @@
- + ]]> + ]]> Published posts Your name? diff --git a/build.gradle b/build.gradle index 8a55444..c95a743 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,18 @@ buildscript { - ext.kotlin_version = '1.0.5-3' + ext.kotlin_version = '1.1.3-2' repositories { jcenter() mavenCentral() + maven { url "https://maven.google.com" } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0-beta1' + classpath 'com.android.tools.build:gradle:2.3.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } plugins { - id 'com.github.ben-manes.versions' version '0.13.0' + id 'com.github.ben-manes.versions' version '0.15.0' } allprojects { @@ -19,5 +20,6 @@ allprojects { jcenter() mavenCentral() maven { url "https://jitpack.io" } + maven { url "https://maven.google.com" } } -} \ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 51288f9..391e13d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 086f4fa..4448bee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 24 18:36:12 CET 2016 +#Fri Jul 14 20:42:12 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip