Updated dependencies

This commit is contained in:
Jan-Lk Else 2017-07-14 21:14:05 +02:00
parent 65a359bf0d
commit 68946e5b6f
7 changed files with 24 additions and 19 deletions

View File

@ -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'
}
}

View File

@ -12,7 +12,7 @@
</head>
<body>
<div id="summernote" style="width:100%;height:100%"></div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="https://rawgit.com/summernote/summernote/master/dist/summernote.min.js"></script>
<script>

View File

@ -262,7 +262,7 @@ class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
R.id.help -> {
MaterialDialog.Builder(this)
.title(R.string.help)
.content(R.string.help_text)
.content(R.string.help_text, true)
.positiveText(android.R.string.ok)
.show()
true

View File

@ -20,7 +20,7 @@
<![CDATA[<!DOCTYPE html><html><head><meta charset=\"utf-8\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css\"><style> * { max-width: 100%; height: auto; word-break: break-all; word-break: break-word; }</style></head><body>]]>
</string>
<string name="viewer_html_end">
<![CDATA[<script src=\"https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js\"></script><script src=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js\"></script></body></html>]]>
<![CDATA[<script src=\"https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js\"></script><script src=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js\"></script></body></html>]]>
</string>
<string name="published">Published posts</string>
<string name="name_question">Your name?</string>

View File

@ -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" }
}
}
}

Binary file not shown.

View File

@ -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