Update sample for Android Java + Firebase functions

andrii-iakovenko · andrii-iakovenko · commit 83426831f2ac · 2021-02-08T16:07:24.000+02:00
diff --git a/samples/android-java-firebase-function/README.md b/samples/android-java-firebase-function/README.md
@@ -1,7 +1,7 @@
 ## E3Kit Android Java Firebase function
 
 ### Prerequisites
-  - Android Studio 3.2.1+
+  - Android Studio 4.0.1+
   - [Firebase function](https://github.com/VirgilSecurity/virgil-e3kit-firebase-func) deployed successfully.
 
 ### How to start
diff --git a/samples/android-java-firebase-function/app/.gitignore b/samples/android-java-firebase-function/app/.gitignore
@@ -1 +1,2 @@
 /build
+google-services.json
diff --git a/samples/android-java-firebase-function/app/build.gradle b/samples/android-java-firebase-function/app/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Virgil Security, Inc.
+ * Copyright (c) 2015-2021, Virgil Security, Inc.
  *
  * Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
  *
@@ -35,14 +35,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.android.virgilsecurity.ethreesamplejavafirebase"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -54,16 +54,16 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:animated-vector-drawable:28.0.0'
-    implementation 'com.android.support:support-media-compat:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    implementation 'androidx.media:media:1.2.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
     // Firebase
-    implementation 'com.google.firebase:firebase-core:16.0.6'
-    implementation 'com.google.firebase:firebase-auth:16.1.0'
+    implementation 'com.google.firebase:firebase-core:18.0.2'
+    implementation 'com.google.firebase:firebase-auth:20.0.2'
 
     // E3Kit
-    implementation "com.virgilsecurity:ethree-kotlin:0.5.0"
+    implementation "com.virgilsecurity:ethree:2.0.8"
 }
diff --git a/samples/android-java-firebase-function/app/src/main/AndroidManifest.xml b/samples/android-java-firebase-function/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2015-2020, Virgil Security, Inc.
+  ~ Copyright (c) 2015-2021, Virgil Security, Inc.
   ~
   ~ Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
   ~
diff --git a/samples/android-java-firebase-function/app/src/main/java/com/android/virgilsecurity/ethreesamplejavafirebase/EThreeActivity.java b/samples/android-java-firebase-function/app/src/main/java/com/android/virgilsecurity/ethreesamplejavafirebase/EThreeActivity.java
diff --git a/samples/android-java-firebase-function/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/samples/android-java-firebase-function/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015-2020, Virgil Security, Inc.
+  ~ Copyright (c) 2015-2021, Virgil Security, Inc.
   ~
   ~ Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
   ~
diff --git a/samples/android-java-firebase-function/app/src/main/res/drawable/ic_launcher_background.xml b/samples/android-java-firebase-function/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2015-2020, Virgil Security, Inc.
+  ~ Copyright (c) 2015-2021, Virgil Security, Inc.
   ~
   ~ Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
   ~
diff --git a/samples/android-java-firebase-function/app/src/main/res/layout/activity_ethree.xml b/samples/android-java-firebase-function/app/src/main/res/layout/activity_ethree.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2015-2020, Virgil Security, Inc.
+  ~ Copyright (c) 2015-2021, Virgil Security, Inc.
   ~
   ~ Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
   ~
@@ -31,7 +31,7 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -49,4 +49,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/samples/android-java-firebase-function/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/samples/android-java-firebase-function/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2015-2020, Virgil Security, Inc.
+  ~ Copyright (c) 2015-2021, Virgil Security, Inc.
   ~
   ~ Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
   ~
diff --git a/samples/android-java-firebase-function/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/samples/android-java-firebase-function/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2015-2020, Virgil Security, Inc.
+  ~ Copyright (c) 2015-2021, Virgil Security, Inc.
   ~
   ~ Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
   ~
diff --git a/samples/android-java-firebase-function/app/src/main/res/values/colors.xml b/samples/android-java-firebase-function/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2015-2020, Virgil Security, Inc.
+  ~ Copyright (c) 2015-2021, Virgil Security, Inc.
   ~
   ~ Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
   ~
diff --git a/samples/android-java-firebase-function/app/src/main/res/values/strings.xml b/samples/android-java-firebase-function/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015-2020, Virgil Security, Inc.
+  ~ Copyright (c) 2015-2021, Virgil Security, Inc.
   ~
   ~ Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
   ~
diff --git a/samples/android-java-firebase-function/app/src/main/res/values/styles.xml b/samples/android-java-firebase-function/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015-2020, Virgil Security, Inc.
+  ~ Copyright (c) 2015-2021, Virgil Security, Inc.
   ~
   ~ Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
   ~
diff --git a/samples/android-java-firebase-function/build.gradle b/samples/android-java-firebase-function/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Virgil Security, Inc.
+ * Copyright (c) 2015-2021, Virgil Security, Inc.
  *
  * Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
  *
@@ -40,8 +40,8 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.google.gms:google-services:4.3.5'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/samples/android-java-firebase-function/gradle.properties b/samples/android-java-firebase-function/gradle.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2020, Virgil Security, Inc.
+# Copyright (c) 2015-2021, Virgil Security, Inc.
 #
 # Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
 #
@@ -39,6 +39,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/samples/android-java-firebase-function/gradle/wrapper/gradle-wrapper.properties b/samples/android-java-firebase-function/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2020, Virgil Security, Inc.
+# Copyright (c) 2015-2021, Virgil Security, Inc.
 #
 # Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
 #
@@ -36,4 +36,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/samples/android-java-firebase-function/settings.gradle b/samples/android-java-firebase-function/settings.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Virgil Security, Inc.
+ * Copyright (c) 2015-2021, Virgil Security, Inc.
  *
  * Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
  *

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`	`2`	`<!--`
`3`		`- ~ Copyright (c) 2015-2020, Virgil Security, Inc.`
	`3`	`+ ~ Copyright (c) 2015-2021, Virgil Security, Inc.`
`4`	`4`	`~`
`5`	`5`	`~ Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>`
`6`	`6`	`~`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`- ~ Copyright (c) 2015-2020, Virgil Security, Inc.`
	`2`	`+ ~ Copyright (c) 2015-2021, Virgil Security, Inc.`
`3`	`3`	`~`
`4`	`4`	`~ Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>`
`5`	`5`	`~`