Merge pull request #159 from veritrans/nexus-signature-validation-error

[CHEC-1025]Fix Nexus signature validation error
veritrans · Apr 5, 2024 · 8b74d6a · 8b74d6a
2 parents db15c9a + ed72d28
commit 8b74d6a
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,7 +18,7 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         versionCode = 5
-        versionName = "2.0.1"
+        versionName = "2.1.0"
     }
 
     signingConfigs {
@@ -75,6 +75,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "com.midtrans.sdk.sample"
 
     publishing {
         singleVariant("release") {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.midtrans.sdk.sample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.2.2")
+        classpath("com.android.tools.build:gradle:7.4.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
         classpath("org.jacoco:org.jacoco.core:$jacoco_version")
         classpath("org.jfrog.buildinfo:build-info-extractor-gradle:4.18.2")

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed May 25 13:34:37 GMT+07:00 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
     id("kotlin-kapt")
     id("kotlin-parcelize")
     id("maven-publish")
+    id("signing")
 }
 
 //from publish-variables.gradle
@@ -92,9 +93,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-
     packagingOptions {
-        exclude("META-INF/*.kotlin_module")
+        resources {
+            excludes += setOf("META-INF/*.kotlin_module")
+        }
     }
 
     buildFeatures {
@@ -108,6 +110,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "com.midtrans.sdk.uikit"
 
     publishing {
         singleVariant("release") {
@@ -276,3 +279,8 @@ afterEvaluate {
         }
     }
 }
+
+signing {
+    sign(publishing.publications)
+}
+
diff --git a/ui/publish-variables.gradle b/ui/publish-variables.gradle
@@ -1,6 +1,6 @@
 ext {
     sdkGroupId = 'com.midtrans'
-    sdkVersion = '2.0.1'
+    sdkVersion = '2.1.0'
     sdkArtifactId = 'uikit'
     sdkEnvSandbox = '-SANDBOX'
     mavenRepo = 'mavencentral'

diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.midtrans.sdk.uikit">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET"/>