Merge branch 'release/2.1.0' into 'master'

release/2.1.0 See merge request Tanker/sdk-android!86
TankerHQ · Aug 22, 2019 · c9d97eb · c9d97eb
2 parents 0a7db44 + 8363523
commit c9d97eb
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 15 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -20,5 +20,3 @@ org.gradle.jvmargs=-Xmx1024m
 # The Android Gradle Plugin uses deprecated APIs, they have until Gradle 6.0 to fix their crap.
 # https://android.googlesource.com/platform/tools/base/+/studio-master-dev/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/scope/BuildArtifactsHolder.kt
 org.gradle.warning.mode=none
-android.enableJetifier=true
-android.useAndroidX=true
diff --git a/tanker-bindings/build.gradle b/tanker-bindings/build.gradle
@@ -141,12 +141,12 @@ dependencies {
     api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.2'
     api 'net.java.dev.jna:jna:4.5.2@aar'
-    implementation 'androidx.core:core:1.0.0'
+    implementation 'com.android.support:support-compat:28.0.0'
+    implementation 'com.android.support:support-annotations:28.0.0'
     testImplementation 'io.kotlintest:kotlintest-core:3.3.2'
     testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.3.2'
-    androidTestImplementation 'androidx.annotation:annotation:1.0.0'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     testImplementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.9'
     testImplementation 'org.slf4j:slf4j-nop:1.7.26'
     testImplementation files('jna.jar')

diff --git a/tanker-bindings/conan/conanfile-deployed.txt b/tanker-bindings/conan/conanfile-deployed.txt
@@ -1,5 +1,5 @@
 [requires]
-tanker/2.0.1@tanker/stable
+tanker/2.1.0-beta2@tanker/stable
 
 [imports]
 lib, *tanker*.so -> .
diff --git a/tanker-bindings/src/androidTest/java/io/tanker/api/TankerTest.java b/tanker-bindings/src/androidTest/java/io/tanker/api/TankerTest.java
@@ -1,8 +1,8 @@
 package io.tanker.api;
 
 import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/tanker-bindings/src/main/kotlin/io/tanker/api/AsynchronousByteChannelWrapper.kt b/tanker-bindings/src/main/kotlin/io/tanker/api/AsynchronousByteChannelWrapper.kt
@@ -1,6 +1,6 @@
 package io.tanker.api
 
-import androidx.annotation.RequiresApi
+import android.support.annotation.RequiresApi
 import java.nio.ByteBuffer
 import java.nio.channels.AsynchronousByteChannel
 import java.nio.channels.CompletionHandler

diff --git a/tanker-bindings/src/main/kotlin/io/tanker/api/Tanker.kt b/tanker-bindings/src/main/kotlin/io/tanker/api/Tanker.kt
@@ -1,6 +1,5 @@
 package io.tanker.api
 
-import androidx.annotation.RequiresApi
 import android.util.Log
 import com.sun.jna.Memory
 import com.sun.jna.Pointer

diff --git a/tanker-bindings/src/main/kotlin/io/tanker/api/TankerAsynchronousByteChannelWrapper.kt b/tanker-bindings/src/main/kotlin/io/tanker/api/TankerAsynchronousByteChannelWrapper.kt
@@ -1,6 +1,6 @@
 package io.tanker.api
 
-import androidx.annotation.RequiresApi
+import android.support.annotation.RequiresApi
 import java.nio.ByteBuffer
 import java.nio.channels.AsynchronousByteChannel
 import java.nio.channels.CompletionHandler

diff --git a/tanker-bindings/src/main/kotlin/io/tanker/api/TankerChannels.kt b/tanker-bindings/src/main/kotlin/io/tanker/api/TankerChannels.kt
@@ -1,6 +1,6 @@
 package io.tanker.api
 
-import androidx.annotation.RequiresApi
+import android.support.annotation.RequiresApi
 import java.io.InputStream
 import java.nio.channels.AsynchronousByteChannel
 

diff --git a/tanker-bindings/src/main/kotlin/io/tanker/api/TankerFuture.kt b/tanker-bindings/src/main/kotlin/io/tanker/api/TankerFuture.kt
@@ -6,7 +6,7 @@ import com.sun.jna.Pointer
 import io.tanker.bindings.TankerLib
 import java.lang.reflect.Type
 import java.util.concurrent.Executors
-import androidx.annotation.WorkerThread
+import android.support.annotation.WorkerThread
 
 class TankerFuture<T>(private var cfuture: Pointer, private var valueType: Type) {
     private sealed class ThenResult {

diff --git a/tanker-bindings/src/test/kotlin/io/tanker/api/TankerResourceChannel.kt b/tanker-bindings/src/test/kotlin/io/tanker/api/TankerResourceChannel.kt
@@ -1,6 +1,6 @@
 package io.tanker.api
 
-import androidx.annotation.RequiresApi
+import android.support.annotation.RequiresApi
 import io.kotlintest.Description
 import io.kotlintest.shouldBe
 import io.kotlintest.shouldNotBe