Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
alanwoolley committed Sep 23, 2018
1 parent 98faac3 commit 4f05a78
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 12 deletions.
13 changes: 5 additions & 8 deletions build.gradle
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.2.21'
ext.kotlin_version = '1.2.70'
ext.anko_version='0.10.4'

repositories {
Expand All @@ -11,7 +11,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down Expand Up @@ -41,11 +41,11 @@ dependencies {
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'commons-io:commons-io:2.4'
implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
implementation 'com.android.support:multidex:1.0.2'
implementation 'com.android.support:multidex:1.0.3'
implementation fileTree(include: '*.jar', dir: 'jars')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.anko:anko-commons:$anko_version"
compile "org.jetbrains.anko:anko-appcompat-v7:$anko_version"
implementation "org.jetbrains.anko:anko-appcompat-v7:$anko_version"
}

android {
Expand Down Expand Up @@ -122,9 +122,6 @@ android {
assets.srcDirs = ['assets']
}

// Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests')

// Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
// This moves them out of them default location under src/<type>/... which would
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
4 changes: 2 additions & 2 deletions jni/Application.mk
@@ -1,3 +1,3 @@
APP_STL := gnustl_static
APP_STL := c++_static
APP_ABI := armeabi-v7a
APP_PLATFORM := android-15
APP_PLATFORM := android-19
2 changes: 1 addition & 1 deletion jni/src
Submodule src updated 218 files

0 comments on commit 4f05a78

Please sign in to comment.