Merge branch 'tim/api_19' into 'master'

Tim/api 19 See merge request Tanker/sdk-android!49
TankerHQ · Mar 11, 2019 · 6869c35 · 6869c35
2 parents b9213c3 + 6703b8f
commit 6869c35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/requirements.lock b/requirements.lock
@@ -1,5 +1,5 @@
 # Generated with dmenv 0.11.0, python 3.7.2+, on Linux
--e git+ssh://[email protected]/Tanker/ci@d74efd7ac6bf2383788cec6b011dd80bc8fa145c#egg=ci
+-e git+ssh://[email protected]/Tanker/ci@7b3969f43f7206fa9a3078ae334134e5049d3bb0#egg=ci
 astroid==2.0.4
 attrs==19.1.0
 bottle==0.12.13

diff --git a/tanker-bindings/build.gradle b/tanker-bindings/build.gradle
@@ -12,7 +12,7 @@ version 'dev'
 android {
     compileSdkVersion 28
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 19
         targetSdkVersion 28
 
         ndk {
@@ -32,6 +32,11 @@ android {
             }
         }
     }
+    externalNativeBuild {
+        cmake {
+            path 'CMakeLists.txt'
+        }
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8