1.2.8

GenesisGateway · Dec 20, 2021 · 3b50913 · 3b50913
1 parent c1b6ecd
commit 3b50913
Show file tree

Hide file tree

Showing 10 changed files with 201 additions and 153 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,12 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
 /.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/assetWizardSettings.xml
+/.idea/caches
+/.idea/misc.xml
 .DS_Store
 /build
 /captures

diff --git a/GenesisAndroid/build.gradle b/GenesisAndroid/build.gradle
@@ -1,15 +1,33 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-android'
-apply from: 'maven-push.gradle'
+apply plugin: 'kotlin-kapt'
+
+ext {
+    PUBLISH_GROUP_ID = 'com.emerchantpay.gateway'
+    PUBLISH_VERSION = '1.2.8'
+    PUBLISH_ARTIFACT_ID = 'genesis-android'
+    PUBLISH_DESCRIPTION = 'Genesis Android SDK'
+    PUBLISH_URL = 'https://github.com/GenesisGateway/android_sdk'
+    PUBLISH_LICENSE_NAME = 'MIT License'
+    PUBLISH_LICENSE_URL = 'https://opensource.org/licenses/MIT'
+    PUBLISH_DEVELOPER_ID = 'GenesisGateway'
+    PUBLISH_DEVELOPER_NAME = 'emerchantpay Ltd.'
+    PUBLISH_DEVELOPER_EMAIL = '[email protected]'
+    PUBLISH_SCM_CONNECTION = 'scm:[email protected]:GenesisGateway/android_sdk.git'
+    PUBLISH_SCM_DEVELOPER_CONNECTION = 'scm:[email protected]:GenesisGateway/android_sdk.git'
+    PUBLISH_SCM_URL = 'https://github.com/GenesisGateway/android_sdk/tree/master'
+}
+
+apply from: "${rootProject.projectDir}/scripts/maven-push.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
-        versionName "1.2.7"
+        versionName "1.2.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -18,11 +36,21 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    buildToolsVersion '28.0.3'
+    packagingOptions {
+        exclude("META-INF/LICENSE*")
+        resources.excludes += "DebugProbesKt.bin"
+    }
+    buildToolsVersion '30.0.3'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    kotlinOptions {
+        freeCompilerArgs = ["-Xallow-result-return-type"]
+        jvmTarget = '1.8'
+    }
+
     dexOptions {
     }
 
@@ -37,21 +65,21 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'com.android.support:multidex:1.0.3'
-    testImplementation 'junit:junit:4.13-rc-2'
-    testImplementation 'org.mockito:mockito-core:2.28.2'
-    testImplementation 'org.mockito:mockito-inline:2.8.47'
-    testImplementation 'org.robolectric:robolectric:3.8'
-    testImplementation 'io.mockk:mockk:1.9.3.kotlin12'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-web:3.3.0'
+    implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
+    implementation "androidx.constraintlayout:constraintlayout:$androidx_constraintlayout_version"
+    implementation "com.google.android.material:material:$android_material_version"
+    implementation "androidx.multidex:multidex:$androidx_multidex_version"
+    implementation "com.android.support:multidex:$androidx_multidex_version"
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.mockito:mockito-core:$mockito_core_version"
+    testImplementation "org.mockito:mockito-inline:$mockito_inline_version"
+    testImplementation "org.robolectric:robolectric:$robolectric_version"
+    testImplementation "io.mockk:mockk:$mockk_version"
+    androidTestImplementation "androidx.test:runner:$androidx_test_runner_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$androidx_espresso_version"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:$androidx_espresso_version"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:$androidx_espresso_version"
+    androidTestImplementation "androidx.test.espresso:espresso-web:$androidx_espresso_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {

diff --git a/GenesisAndroid/gradle/wrapper/gradle-wrapper.properties b/GenesisAndroid/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-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.4-all.zip
diff --git a/GenesisAndroid/maven-push.gradle b/GenesisAndroid/maven-push.gradle
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ cd GenesisAndroid
 * Add the dependency in your build.gradle:
 ```
 dependencies {
-  implementation 'com.emerchantpay.gateway:genesis-android:1.2.7'
+  implementation 'com.emerchantpay.gateway:genesis-android:1.2.8'
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -1,26 +1,49 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext {
+        kotlin_version = '1.6.0'
+        gradle_plugin_version = '7.0.4'
+        android_material_version = '1.4.0'
+        junit_version = '4.13.1'
+        mockito_core_version = '2.28.2'
+        mockito_inline_version = '2.8.47'
+        mockk_version = '1.11.0'
+        robolectric_version = '4.6.1'
+
+        // AndroidX
+        androidx_appcompat_version = '1.4.0'
+        androidx_constraintlayout_version = '2.1.2'
+        androidx_multidex_version = '2.0.1'
+        androidx_test_runner_version = '1.4.0'
+        androidx_espresso_version = '3.4.0'
+
+        // Nexus
+        nexus_publish_plugin_version = '1.1.0'
+    }
 
     repositories {
+        maven { url "https://plugins.gradle.org/m2/" }
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath "com.android.tools.build:gradle:$gradle_plugin_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-
+        classpath "io.github.gradle-nexus:publish-plugin:$nexus_publish_plugin_version"
+        
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
+apply plugin: 'io.github.gradle-nexus.publish-plugin'
+apply from: "${rootDir}/scripts/publish-root.gradle"
+
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -11,34 +11,13 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-# Github Environment variables
-VERSION_NAME=1.2.7
-VERSION_CODE=1
-GROUP=com.emerchantpay.gateway
-
-POM_DESCRIPTION=Genesis Android SDK
-POM_URL=https://github.com/GenesisGateway/android_sdk
-POM_SCM_URL=https://github.com/GenesisGateway/android_sdk
-POM_SCM_CONNECTION=scm:[email protected]:GenesisGateway/android_sdk.git
-POM_SCM_DEV_CONNECTION=scm:[email protected]:GenesisGateway/android_sdk.git
-POM_LICENCE_NAME=MIT License
-POM_LICENCE_URL=https://opensource.org/licenses/MIT
-POM_LICENCE_DIST=https://github.com/GenesisGateway/android_sdk/blob/master/LICENSE
-POM_DEVELOPER_ID=GenesisGateway
-POM_DEVELOPER_NAME=emerchantpay Ltd.
-
-# POM Environment variables
-POM_NAME=GenesisAndroid
-POM_ARTIFACT_ID=genesis-android
-POM_PACKAGING=aar
-
 # Nexus variables
 NEXUS_USERNAME=sonatype_username
 NEXUS_PASSWORD=sonatype_password

diff --git a/gradle/wrapper/gradle-wrapper.properties b/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-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip