MOB-1552: add support for dynamic affiliation and connection types.

.gitignore

@@ -6,6 +6,9 @@
 *.war
 *.ear
 
+# Keep gradle wrapper binary in the project
+!me.id.webverify/gradle/wrapper/gradle-wrapper.jar
+
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 

me.id.webverify/app/build.gradle

@@ -20,6 +20,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 repositories
         {
@@ -29,7 +33,6 @@ repositories
         }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile "com.android.support:appcompat-v7:${rootProject.ext.androidSupportLibraryVersion}"
-    compile project(':webverifylib')
+    implementation project(':webverifylib')
+    implementation "androidx.appcompat:appcompat:${rootProject.ext.androidXAppCompat}"
 }

me.id.webverify/app/src/main/java/me/id/meidwebverify/MainActivity.java

@@ -1,16 +1,18 @@
 package me.id.meidwebverify;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBarActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.util.Locale;
 
+import me.id.webverifylib.IDmeAffiliation;
 import me.id.webverifylib.IDmeAffiliationType;
 import me.id.webverifylib.IDmeConnectionType;
 import me.id.webverifylib.IDmeProfile;
@@ -20,7 +22,7 @@
 import me.id.webverifylib.listener.IDmeGetProfileListener;
 import me.id.webverifylib.listener.IDmeScope;
 
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
   private String clientId = null;
   private String secretId = null;
   private String redirectUri = null;
@@ -45,28 +47,18 @@ public void onClick(View view) {
       }
     });
 
-    Button btnAddAffiliation = (Button) findViewById(R.id.btnAddAffiliation);
-    btnAddAffiliation.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        addAffiliation();
-      }
-    });
+    Button btnAddAffiliation = findViewById(R.id.btnAddAffiliation);
+    btnAddAffiliation.setOnClickListener(v -> addAffiliation());
 
-    Button btnAddConnection = (Button) findViewById(R.id.btnAddConnection);
-    btnAddConnection.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        addConnection();
-      }
-    });
+    Button btnAddConnection = findViewById(R.id.btnAddConnection);
+    btnAddConnection.setOnClickListener(v -> addConnection());
   }
 
   /**
    * Method that starts de authentication process
    */
   void login() {
-    Spinner propRoute = (Spinner) findViewById(R.id.spnProperties);
+    Spinner propRoute = findViewById(R.id.spnProperties);
     returnProperties = propRoute.getSelectedItem().toString().equals("Yes");
 
     IDmeWebVerify.getInstance().login(this, Scope.DEFAULT, new IDmeGetAccessTokenListener() {

me.id.webverify/app/src/main/java/me/id/meidwebverify/Scope.java

@@ -1,6 +1,6 @@
 package me.id.meidwebverify;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import me.id.webverifylib.listener.IDmeScope;
 

me.id.webverify/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath "com.android.tools.build:gradle:4.0.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -16,15 +16,22 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
-
+        google()
     }
 }
 
 ext {
-    minSdk = 15
-    targetSdk = 25
-    buildToolsVersion = '25.0.1'
-    compileSdkVersion = 25
+    minSdk = 21
+    targetSdk = 29
+    buildToolsVersion = '29.0.3'
+    compileSdkVersion = 29
+
+    androidXAnnotations = '1.1.0'
+    androidXAppCompat = '1.1.0'
+    androidXBrowser = '1.2.0'
+}
 
-    androidSupportLibraryVersion = '25.3.1'
+// `./gradlew wrapper --gradle-version=[version]` uses the distribution type all
+wrapper {
+    distributionType = Wrapper.DistributionType.ALL
 }

me.id.webverify/gradle.properties

@@ -33,3 +33,5 @@ POM_DEVELOPER_NAME=ID.me
 POM_NAME=ID.me Web Verify (Android)
 POM_ARTIFACT_ID=webverifylib
 POM_PACKAGING=aar
+android.useAndroidX=true
+android.enableJetifier=true

me.id.webverify/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Mar 15 12:25:03 UYT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

me.id.webverify/webverifylib/build.gradle

@@ -14,20 +14,17 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-        debug {
-            // Define a default value for building the tests. This is not used when building any dependent
-            // libraries or apps.
-            manifestPlaceholders = [
-                    idmeAuthRedirectScheme: 'id.me.scheme'
-            ]
-        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile "com.android.support:appcompat-v7:${rootProject.ext.androidSupportLibraryVersion}"
-    compile "com.android.support:customtabs:${rootProject.ext.androidSupportLibraryVersion}"
+    implementation "androidx.annotation:annotation:${rootProject.ext.androidXAnnotations}"
+    implementation "androidx.appcompat:appcompat:${rootProject.ext.androidXAppCompat}"
+    implementation "androidx.browser:browser:${rootProject.ext.androidXBrowser}"
 }
 
 def isReleaseBuild() {
@@ -36,4 +33,4 @@ def isReleaseBuild() {
     return version.contains("SNAPSHOT") == false
 }
 
-apply from: '../maven_push.gradle'
+apply from: '../maven_push.gradle'

me.id.webverify/webverifylib/src/main/java/me/id/webverifylib/AccessTokenManager.java

@@ -2,7 +2,8 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;

me.id.webverify/webverifylib/src/main/java/me/id/webverifylib/AsyncSharedPreferenceLoader.java

@@ -3,7 +3,8 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
 
 import java.util.concurrent.ExecutionException;