Merge pull request #612 from Iterable/wip/fix-ci

Fix CI

Author: Ayyanchira

app/src/androidTest/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:tools="http://schemas.android.com/tools" package="iterable.com.iterableapi">
-    <uses-sdk tools:overrideLibrary="br.com.concretesolutions.kappuccino,android_libs.ub_uiautomator"/>
+    <uses-sdk tools:overrideLibrary="br.com.concretesolutions.kappuccino,android_libs.ub_uiautomator,androidx.security"/>
 </manifest>

app/src/main/AndroidManifest.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.iterable.iterableapi.testapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.iterable.iterableapi.testapp">
+    <uses-sdk tools:overrideLibrary="androidx.security"/>
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

iterableapi-ui/src/main/AndroidManifest.xml

@@ -1,5 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.iterable.iterableapi.ui">
+    <uses-sdk tools:overrideLibrary="androidx.security"/>
     <application>
         <activity
             android:name=".inbox.IterableInboxActivity"

iterableapi/build.gradle

@@ -7,6 +7,11 @@ android {
     compileSdkVersion 29
     buildToolsVersion '29.0.3'
 
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 27

iterableapi/src/androidTest/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="iterable.com.iterableapi">
-    <uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator"/>
+    <uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator,androidx.security"/>
     <application
         android:label="IterableAPI"
         android:supportsRtl="true" />

iterableapi/src/main/java/com/iterable/iterableapi/IterableKeychain.kt

@@ -31,10 +31,10 @@ class IterableKeychain {
             IterableLogger.v(TAG, "SharedPreferences being used")
         } else {
             // See if EncryptedSharedPreferences can be created successfully
-            val masterKeyAlias = MasterKey.Builder(context)
-                .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
-                .build()
             try {
+                val masterKeyAlias = MasterKey.Builder(context)
+                    .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                    .build()
                 sharedPrefs = EncryptedSharedPreferences.create(
                     context,
                     encryptedSharedPrefsFileName,

iterableapi/src/test/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.iterable.iterableapi" android:versionName="1.2.3" android:versionCode="321">
+<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="com.iterable.iterableapi" android:versionName="1.2.3" android:versionCode="321">
+    <uses-sdk tools:overrideLibrary="androidx.security"/>
     <application
         android:label="IterableAPI"
         android:supportsRtl="true">