Merge pull request #53 from iZettle/feature/bump

Bump deps

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.31'
+    ext.kotlin_version = '1.2.41'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-alpha11'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha14'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

wrench-app/build.gradle

@@ -62,14 +62,14 @@ android {
 dependencies {
     testImplementation 'junit:junit:4.12'
 
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2-beta1'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2-beta1'
-    androidTestImplementation 'android.arch.persistence.room:testing:1.1.0-beta2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'android.arch.persistence.room:testing:1.1.0'
 
     annotationProcessor "android.arch.lifecycle:compiler:1.1.1"
-    annotationProcessor "android.arch.persistence.room:compiler:1.1.0-beta2"
+    annotationProcessor "android.arch.persistence.room:compiler:1.1.0"
     annotationProcessor "com.google.dagger:dagger-android-processor:2.15"
-    annotationProcessor "com.google.dagger:dagger-compiler:2.15"
+    annotationProcessor "com.google.dagger:dagger-compiler:2.16"
 
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support:recyclerview-v7:27.1.1'
@@ -78,10 +78,10 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.0'
     implementation 'com.android.support:cardview-v7:27.1.1'
     implementation 'android.arch.lifecycle:extensions:1.1.1'
-    implementation 'android.arch.persistence.room:runtime:1.1.0-beta2'
-    implementation "android.arch.paging:runtime:1.0.0-beta1"
+    implementation 'android.arch.persistence.room:runtime:1.1.0'
+    implementation "android.arch.paging:runtime:1.0.0"
 
-    implementation "com.google.dagger:dagger:2.15"
+    implementation "com.google.dagger:dagger:2.16"
     implementation "com.google.dagger:dagger-android:2.15"
     implementation "com.google.dagger:dagger-android-support:2.15"
 

wrench-sample/build.gradle

@@ -45,14 +45,14 @@ android {
 
 dependencies {
     kapt "com.google.dagger:dagger-android-processor:2.15"
-    kapt "com.google.dagger:dagger-compiler:2.15"
+    kapt "com.google.dagger:dagger-compiler:2.16"
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.18.0'
+    testImplementation 'org.mockito:mockito-core:2.18.3'
 
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2-beta1'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2-beta1'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2-beta1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
     androidTestImplementation project(":wrench-core")
     androidTestImplementation project(":wrench-prefs")
 
@@ -62,7 +62,7 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.0'
     implementation 'android.arch.lifecycle:extensions:1.1.1'
 
-    implementation "com.google.dagger:dagger:2.15"
+    implementation "com.google.dagger:dagger:2.16"
     implementation "com.google.dagger:dagger-android:2.15"
     implementation "com.google.dagger:dagger-android-support:2.15"
 

wrench-sample/src/androidTest/java/com/example/wrench/preferences/PreferencesTest.java

@@ -24,6 +24,7 @@
 import org.junit.runner.RunWith;
 
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
 
 @RunWith(AndroidJUnit4.class)
 public class PreferencesTest {
@@ -39,8 +40,8 @@ public void setUp() {
     public void checkBoolean() {
         String key = "boolean";
         WrenchPreferences wrenchPreferences = new WrenchPreferences(mockContext);
-        assertEquals(false, wrenchPreferences.getBoolean(key, false));
-        assertEquals(false, wrenchPreferences.getBoolean(key, true));
+        assertFalse(wrenchPreferences.getBoolean(key, false));
+        assertFalse(wrenchPreferences.getBoolean(key, true));
     }
 
     @Test

wrench-service/build.gradle

@@ -31,7 +31,7 @@ dependencies {
     implementation project(":wrench-core")
     testImplementation 'junit:junit:4.12'
     implementation 'com.android.support:support-annotations:27.1.1'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

wrench-service/src/main/java/com/izettle/wrench/service/WrenchService.kt

@@ -1,5 +1,6 @@
 package com.izettle.wrench.service
 
+import android.annotation.SuppressLint
 import android.app.IntentService
 import android.content.ContentResolver
 import android.content.Intent
@@ -70,6 +71,7 @@ class WrenchService : IntentService("WrenchService") {
         contentResolver.update(WrenchProviderContract.boltUri(bolt.id), bolt.toContentValues(), null, null)
     }
 
+    @SuppressLint("Recycle")
     private fun getBolt(contentResolver: ContentResolver, @Bolt.BoltType boltType: String, key: String): Bolt? {
         val cursor = contentResolver.query(WrenchProviderContract.boltUri(key), null, null, null, null)
         cursor.use {