- Fix gradle files

cmdotcom · Mar 17, 2023 · ab04088 · ab04088
1 parent 6639074
commit ab04088
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 62 deletions.
diff --git a/androidposintegration/build.gradle b/androidposintegration/build.gradle
@@ -39,17 +39,6 @@ android {
             buildConfigField "String", "ACTION_INFO", "\"${intentPrefix}${actionInfoRequest}\""
 
           }
-
-        crt {
-            debuggable false
-            def env = ".crt"
-            def intentPrefix = "com.payplaza"
-            buildConfigField "String", "ACTION_TRANSACTION", "\"${intentPrefix}${env}${actionTrans}\""
-            buildConfigField "String", "ACTION_STATUSES", "\"${intentPrefix}${env}${actionStatusesRequest}\""
-            buildConfigField "String", "ACTION_INFO", "\"${intentPrefix}${env}${actionInfoRequest}\""
-
-        }
-
         debug {
             debuggable true
             def env = ".dev"
@@ -58,15 +47,6 @@ android {
             buildConfigField "String", "ACTION_STATUSES", "\"${intentPrefix}${env}${actionStatusesRequest}\""
             buildConfigField "String", "ACTION_INFO", "\"${intentPrefix}${env}${actionInfoRequest}\""
         }
-
-        local {
-            debuggable true
-            def env = ".local"
-            def intentPrefix = "com.payplaza"
-            buildConfigField "String", "ACTION_TRANSACTION", "\"${intentPrefix}${env}${actionTrans}\""
-            buildConfigField "String", "ACTION_STATUSES", "\"${intentPrefix}${env}${actionStatusesRequest}\""
-            buildConfigField "String", "ACTION_INFO", "\"${intentPrefix}${env}${actionInfoRequest}\""
-        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -75,12 +55,6 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-
-    testOptions.unitTests.all {
-        testLogging {
-            events 'passed', 'skipped', 'failed', 'standardOut', 'standardError'
-        }
-    }
 }
 
 apply plugin: 'com.android.library'
@@ -112,43 +86,19 @@ dependencies {
 afterEvaluate {
     publishing {
         publications {
-            // Creates a Maven publication called "release".
             mavenAar(MavenPublication) {
-                groupId = "com.payplaza.payments"
+                groupId = "com.cm.payments"
                 artifactId = rootProject.name
                 version = project.android.defaultConfig.versionName
                 artifact bundleReleaseAar
             }
 
             mavenAarDebug(MavenPublication) {
-                groupId = "com.payplaza.payments"
+                groupId = "com.cm.payments"
                 artifactId = "${rootProject.name}-debug"
                 version = project.android.defaultConfig.versionName
                 artifact bundleDebugAar
             }
-
-            mavenAarCrt(MavenPublication) {
-                groupId = "com.payplaza.payments"
-                artifactId = "${rootProject.name}-crt"
-                version = project.android.defaultConfig.versionName
-                artifact bundleCrtAar
-            }
-        }
-        repositories {
-            maven {
-                name = "gitlab"
-                url = uri("https://gitlab.com/api/v4/projects/${System.getenv("CI_PROJECT_ID")}/packages/maven")
-                credentials(HttpHeaderCredentials) {
-                    name = "Job-Token"
-                    value = System.getenv("CI_JOB_TOKEN")
-                }
-                authentication {
-                    header(HttpHeaderAuthentication)
-                }
-            }
         }
     }
-}
-repositories {
-    mavenCentral()
 }
diff --git a/androidposintegration/src/main/AndroidManifest.xml b/androidposintegration/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.payplaza.androidposintegration">
+    package="com.cm.androidposintegration">
 
 
     <application>

diff --git a/...posintegration/src/main/java/com/cm/androidposintegration/activity/IntegrationActivity.kt b/...posintegration/src/main/java/com/cm/androidposintegration/activity/IntegrationActivity.kt
@@ -8,7 +8,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 import com.cm.androidposintegration.intent.IntentHelper
 import com.cm.androidposintegration.service.callback.RequestId
-import com.payplaza.androidposintegration.BuildConfig
+import com.cm.androidposintegration.BuildConfig
 
 open class IntegrationActivity : AppCompatActivity() {
 

diff --git a/gradle.properties b/gradle.properties
@@ -15,10 +15,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -XX:MaxPermSize=256m
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-
-# The visual branding to use. Can be overridden via comand line,
-# e.g. -Pbranding=emerchantpay
-#branding=payplaza
-branding=emerchantpay
-
-#branding=emerchantpay
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,3 @@
-rootProject.name = "androidposintegration"
+rootProject.name = "androidposintegrationsdk"
 include ':app'
 include ':androidposintegration'