Permalink
Browse files

update some dependencies

  • Loading branch information...
westnordost committed Apr 22, 2018
1 parent 2a3fd28 commit a8e9bcea25eb8c3fcff3237c722688ddf89f51b6
Showing with 15 additions and 24 deletions.
  1. +15 −14 app/build.gradle
  2. +0 −10 gradle.properties
View
@@ -11,16 +11,16 @@ android {
signingConfigs {
release
}
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 27
buildToolsVersion '27.0.3'
testOptions {
unitTests.returnDefaultValues = true
}
defaultConfig {
applicationId "de.westnordost.streetcomplete"
minSdkVersion 17
targetSdkVersion 26
targetSdkVersion 27
versionCode 600
versionName "6.0-beta1"
testInstrumentationRunner "android.test.InstrumentationTestRunner"
@@ -71,17 +71,17 @@ dependencies {
// tests (perhaps migrate to junit4 later if any features of it seem convenient or necessary)
testImplementation 'junit:junit:3.8.1'
testImplementation 'org.mockito:mockito-core:1.10.19'
testImplementation 'org.objenesis:objenesis:2.5.1'
testImplementation 'org.objenesis:objenesis:2.6'
testImplementation 'org.assertj:assertj-core:2.8.0'
// LutimImageUploaderTest uses org.json which is included in Android but needs library for
// non-android test cases
testImplementation 'org.eclipse.ecf:org.json:1.0.0.v201011060100'
androidTestImplementation 'org.assertj:assertj-core:2.8.0'
androidTestImplementation 'com.android.support:support-annotations:26.1.0'
androidTestImplementation 'com.android.support.test:runner:0.5'
androidTestImplementation 'com.android.support:support-annotations:27.1.1'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'org.mockito:mockito-core:1.10.19'
androidTestImplementation 'org.objenesis:objenesis:2.5.1'
androidTestImplementation 'org.objenesis:objenesis:2.6'
androidTestImplementation "com.crittercism.dexmaker:dexmaker:1.4"
androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:1.4"
androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:1.4"
@@ -91,12 +91,12 @@ dependencies {
annotationProcessor 'com.google.dagger:dagger-compiler:2.14.1'
// Android stuff
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support:preference-v7:26.1.0'
implementation 'com.android.support:preference-v14:26.1.0'
implementation 'com.android.support:support-v13:26.1.0'
implementation 'com.android.support:support-v4:26.1.0'
implementation 'com.android.support:design:26.1.0'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:preference-v7:27.1.1'
implementation 'com.android.support:preference-v14:27.1.1'
implementation 'com.android.support:support-v13:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:design:27.1.1'
// scheduling background jobs
implementation 'com.evernote:android-job:1.1.12'
@@ -117,10 +117,11 @@ dependencies {
implementation 'com.duolingo.open:rtl-viewpager:1.0.2'
// versions above 1.1.0 (i.e. 1.1.3) have unsolved crash issues
implementation 'com.github.florent37:viewtooltip:1.1.0'
implementation 'com.android.support:exifinterface:26.1.0'
implementation 'com.android.support:exifinterface:27.1.1'
// serialization
implementation 'com.esotericsoftware:kryo:4.0.1'
implementation 'org.objenesis:objenesis:2.6'
// map and location
implementation 'com.mapzen.tangram:tangram:0.8.1'
View
@@ -16,13 +16,3 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# I am getting
# Error:Gradle: failed to create directory 'D:\Documents\Android\streetcomplete\app\build\generated\source\r\debug\de\westnordost\streetcomplete'.
# Error:Gradle: java.util.concurrent.ExecutionException: java.util.concurrent.ExecutionException: com.android.tools.aapt2.Aapt2Exception: AAPT2 error: check logs for details
# when executing :app:assembleDebug directly with gradle (but not when running the task from Android Studio)
# StackOverflow etc. answers suggest to turn off AAPT2 then. Will have to do that for now because I
# have no idea why it fails to create that directory.
# https://developer.android.com/studio/build/gradle-plugin-3-0-0.html
android.enableAapt2=false

0 comments on commit a8e9bce

Please sign in to comment.