Merge pull request #9 from getyoti/DEP-86_UpdateAndroidXAndeDeploy

DEP-86 update android x and deploy

Author: cquemin

build.gradle

@@ -2,13 +2,14 @@
 
 buildscript {
     repositories {
+        mavenLocal()
         jcenter()
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0"
+        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.20.0"
     }
 }
 
@@ -17,19 +18,19 @@ apply plugin: 'io.codearte.nexus-staging'
 
 allprojects {
     repositories {
+        mavenLocal()
         mavenCentral()
         jcenter()
         google()
     }
 
     ext {
         // Android config
-        androidBuildToolsVersion = project.ext.buildToolsVersion
         androidMinSdkVersion = minSdkVersionVersion.toInteger()
         androidTargetSdkVersion = targetSdkVersion.toInteger()
         androidCompileSdkVersion = compileSdkVersion.toInteger()
 
-        libAndroidSupportv7 = "com.android.support:appcompat-v7:${supportLibraryVersion}"
+        libAndroidSupport = "androidx.appcompat:appcompat:$supportLibraryVersion"
 
         // Testing
         libJunit = "junit:junit:${libJunitVersion}"

gradle.properties

@@ -21,48 +21,45 @@
 #org.gradle.daemon=true
 
 
-buildToolsVersion=26.0.2
 minSdkVersionVersion=15
-targetSdkVersion=25
-compileSdkVersion=25
+targetSdkVersion=28
+compileSdkVersion=28
 
 yotiCommonUIVersion=0.0.5
-supportLibraryVersion=25.3.1
+supportLibraryVersion=1.0.2
 
 libJunitVersion=4.12
 libMockitoVersion=1.10.19
 
-currentVersion=1.1.0
-currentVersionCode=000008
 currentAppName=Mobile Button SDK
-artefactName=yoti-button-sdk
-
-# OSSRH repositories
-ossrhSnapshotRepository=https://oss.sonatype.org/content/repositories/snapshots
-ossrhRepository=https://oss.sonatype.org/service/local/staging/deploy/maven2/
 
-# Empty sonatype username and password so we can assemble locally
-# To publish define these in your global gradle properties with the correct values or use -P in the command line
-sonatypeUsername
-sonatypePassword
+# Publication
+releaseRepository=https://nexus.internal.yoti.com/repository/maven-releases/
+repoUsername=android
+repoPassword=replaceMe
 
-# POM configuration
+pomId=yoti-button-sdk
 pomGroup=com.yoti.mobile.android.sdk
-pomName=Yoti Button SDK
 pomPackaging=aar
-pomDescription=Button SDK that allws 3rd party to trigger Yoti as support app
-pomUrl=https://github.com/getyoti/android-sdk-button.git
+pomVersion=1.1.0
+pomDescription=Button SDK that allows 3rd party to trigger Yoti as support app
+currentVersionCode=000008
+
+pomLicenseName=Yoti License
+pomLicenseUrl=https://github.com/getyoti/java/LICENSE.txt
 
 pomScmUrl=scm:https://github.com/getyoti/android-sdk-button.git
 pomScmConnection=scm:https://github.com/getyoti/android-sdk-button.git
-pomScmDevConnection=https://github.com/getyoti/android-sdk-button.git
 
-pomLicenseName=Yoti License
-pomLicenseUrl=https://github.com/getyoti/java/LICENSE.txt
+# Maven central specificities
+publishAarVersion=1.3.3
+publishAarMavenCentralVersion=1.1.0
 
-pomDeveloperNames=Adrien Violet,Cyrille Quemin
-pomDeveloperIds=AdrienVioletYoti,cquemin
+sonatypeUsername=yoti
+sonatypePassword=aStrongPassword
 
-#name of thask that will generate extra artifact to archives
-#artifactsToArchive=generateDebugJavadocJar,generateDebugSourcesJar
-artifactsToArchive=generateReleaseJavadocJar,generateReleaseSourcesJar
+signing.keyId=1A234BCD
+signing.password=anotherStrongPassword
+signing.secretKeyRingFile=/path/to/the/gpg/file.gpg
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip

sample-app-2/build.gradle

@@ -1,19 +1,17 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion parent.ext.androidCompileSdkVersion
 
 
     defaultConfig {
-        applicationId "com.madmaclon.sample_app_2"
-        minSdkVersion 16
-        targetSdkVersion 26
+        applicationId "com.yoti.mobile.android.button.sdk.sampleapp2"
+        minSdkVersion parent.ext.androidMinSdkVersion
+        targetSdkVersion parent.ext.androidTargetSdkVersion
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -27,8 +25,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation parent.ext.libAndroidSupport
     testImplementation 'junit:junit:4.12'
-    implementation("com.yoti.mobile.android.sdk:yoti-button-sdk:0.0.6")
-    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation("com.yoti.mobile.android.sdk:yoti-button-sdk:1.1.0")
+    implementation 'com.google.code.gson:gson:2.8.5'
 }

sample-app-2/src/main/java/com/yoti/mobile/android/sampleapp2/MainActivity.java

@@ -1,7 +1,7 @@
 package com.yoti.mobile.android.sampleapp2;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ProgressBar;

sample-app-2/src/main/java/com/yoti/mobile/android/sampleapp2/ProfileActivity.java

@@ -2,7 +2,7 @@
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Base64;
 import android.widget.ImageView;

sample-app/build.gradle

@@ -2,10 +2,9 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion parent.ext.androidCompileSdkVersion
-    buildToolsVersion parent.ext.androidBuildToolsVersion
 
     defaultConfig {
-        applicationId "com.yoti.mobile.android.sdk.sampleapp"
+        applicationId "com.yoti.mobile.android.button.sdk.sampleapp"
         minSdkVersion parent.ext.androidMinSdkVersion
         targetSdkVersion parent.ext.androidTargetSdkVersion
         versionCode 1
@@ -40,17 +39,16 @@ android {
             signingConfig signingConfigs.release
         }
     }
-    buildToolsVersion '26.0.2'
 }
 
 
 dependencies {
-    implementation parent.ext.libAndroidSupportv7
+    implementation parent.ext.libAndroidSupport
     testImplementation 'junit:junit:4.12'
 
     implementation project(path: ':yoti-sdk')
 
 
 // Use this version if you want to point at the dependency published on mavenCentral
-//    implementation("com.yoti.mobile.android:base-commons-ui:0.0.5)
+    //implementation("com.yoti.mobile.android.sdk:yoti-button-sdk:1.1.0")
 }

sample-app/src/main/java/com/yoti/mobile/android/sdk/sampleapp/MainActivity.java

@@ -1,7 +1,7 @@
 package com.yoti.mobile.android.sdk.sampleapp;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ProgressBar;
@@ -25,9 +25,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_main);
 
-        mYotiSDKButton = (YotiSDKButton) findViewById(R.id.button);
-        mProgress = (ProgressBar) findViewById(R.id.progress);
-        mMessage = (TextView)findViewById(R.id.text);
+        mYotiSDKButton = findViewById(R.id.button);
+        mProgress = findViewById(R.id.progress);
+        mMessage = findViewById(R.id.text);
 
         mYotiSDKButton.setOnYotiButtonClickListener(new YotiSDKButton.OnYotiButtonClickListener() {
             @Override

yoti-sdk/build.gradle

@@ -1,54 +1,22 @@
 apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
-apply from: 'publication.gradle'
 
 
-group = "com.yoti.mobile.android"
-version = currentVersion
+group = "$pomGroup"
+version = "$pomVersion"
 
 
 android {
     compileSdkVersion parent.ext.androidCompileSdkVersion
-    buildToolsVersion parent.ext.androidBuildToolsVersion
 
     defaultConfig {
 
         minSdkVersion parent.ext.androidMinSdkVersion
         targetSdkVersion parent.ext.androidTargetSdkVersion
 
         versionCode currentVersionCode.toInteger()
-        versionName currentVersion
+        versionName pomVersion
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-    signingConfigs {
-        debug {
-            storeFile file('debug.keystore')
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-            storePassword 'android'
-        }
-        release {
-            storeFile file('debug.keystore')
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-            storePassword 'android'
-        }
-    }
-
-    buildTypes {
-        debug {
-            signingConfig signingConfigs.debug
-            debuggable true
-            versionNameSuffix "-SNAPSHOT"
-        }
-
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
-        }
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     testOptions {
@@ -58,77 +26,13 @@ android {
     lintOptions {
         abortOnError false
     }
-
-    libraryVariants.all { variant ->
-        String libRootName
-        variant.outputs.all { output ->
-            libRootName = "${archivesBaseName}-${variant.buildType.name}"
-
-            output.outputFileName = "${libRootName}.aar"
-        }
-
-        String taskPrefix = "generate" + variant.name.capitalize()
-        String javadocSuffix = "Javadoc"
-        String javadocJarSuffix = "JavadocJar"
-        String sourcesJarSuffix = "SourcesJar"
-
-
-        task(taskPrefix + javadocSuffix, type: Javadoc) {
-            failOnError false
-            source = variant.getJavaCompiler().source
-
-            title = "Button SDK :${variant.name}"
-            description "Generates Javadoc for ${variant.name}."
-
-            destinationDir = new File(new File("${project.getBuildDir()}/docs/javadoc/", variant.baseName), "html")
-
-            options.links("http://docs.oracle.com/javase/7/docs/api/");
-            options.linksOffline("http://d.android.com/reference","${android.sdkDirectory}/docs/reference");
-
-            ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
-            classpath += files(ext.androidJar)
-            classpath += files(variant.javaCompile.classpath.files)
-            classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-            classpath += configurations.compile
-
-            exclude '**/BuildConfig.java'
-            exclude '**/R.java'
-        }
-
-        task(taskPrefix + javadocJarSuffix, type: Jar, dependsOn: taskPrefix + javadocSuffix) {
-            destinationDir = new File("${project.getBuildDir()}/outputs/jar")
-            archiveName = libRootName+ "-javadoc.jar"
-            classifier = "javadoc"
-            extension = "jar"
-
-            from tasks[taskPrefix + javadocSuffix].destinationDir
-        }
-
-        task(taskPrefix + sourcesJarSuffix, type: Jar) {
-            destinationDir = new File("${project.getBuildDir()}/outputs/jar")
-            archiveName = libRootName+ "-sources.jar"
-            classifier = "sources"
-            extension = "jar"
-
-            from android.sourceSets.main.java.sourceFiles
-        }
-
-        artifacts {
-            archives tasks[taskPrefix + javadocJarSuffix]
-            archives tasks[taskPrefix + sourcesJarSuffix]
-        }
-    }
 }
 
 dependencies {
-    implementation parent.ext.libAndroidSupportv7
     testImplementation parent.ext.libJunit
     testImplementation parent.ext.libMockito
 
+    implementation parent.ext.libAndroidSupport
+
     api(group: 'com.yoti.mobile.android', name: 'base-commons-ui', version: yotiCommonUIVersion, ext: 'aar')
 }
-
-// Wrapper upload task to get correct artifacts to repos
-task publishDebug(dependsOn: ["publishDebugPublicationToSnapshotRepository"], group: "publishing");
-task publishRelease(dependsOn: ["publishReleasePublicationToReleaseRepository"], group: "publishing");
-task publishForSdkDebug(dependsOn: ["publishDebug"], group: "publishing");