Merge pull request #5 from arrazyfathan/develop

Change base URL and update version to 2.0
arrazyfathan · Jan 14, 2023 · 82bb392 · 82bb392
2 parents 1912840 + 8c2d48e
commit 82bb392
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 56 deletions.
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'androidx.navigation.safeargs'
-    id 'dagger.hilt.android.plugin' version '2.41'
     id 'kotlin-kapt'
     id 'kotlin-parcelize'
     id 'com.google.gms.google-services'
@@ -91,8 +90,8 @@ android {
                     versionName "${versionMajor}.${versionMinor}"
                     resValue "string", "version_name", "${versionMajor}.${versionMinor}"
                 } else {
-                    versionName "${versionMajor}.${versionMinor}.${versionMaintenace}"
-                    resValue "string", "version_name", "${versionMajor}.${versionMinor}.${versionMaintenace}"
+                    versionName "${versionMajor}.${versionMinor}.${versionMaintenance}"
+                    resValue "string", "version_name", "${versionMajor}.${versionMinor}.${versionMaintenance}"
                 }
                 resValue "string", "package_name", "${packageName}"
 
@@ -101,8 +100,8 @@ android {
                     manifestPlaceholders += [(constantName): constantValue]
                     buildConfigField "String", "${constantName}", "\"${constantValue}\""
                 }
-                makeAConstant("application_name", appAliasName)
                 resValue "string", "app_name", appAliasName
+                makeAConstant("application_name", appAliasName)
             }
         }
     } else {
@@ -125,9 +124,6 @@ android {
             debuggable true
         }
         release {
-            minifyEnabled true
-            shrinkResources true
-            debuggable false
             signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }

diff --git a/app/src/main/java/com/example/kbbikamusbesarbahasaindonesia/utils/Constant.kt b/app/src/main/java/com/example/kbbikamusbesarbahasaindonesia/utils/Constant.kt
@@ -2,6 +2,5 @@ package com.example.kbbikamusbesarbahasaindonesia.utils
 
 object Constant {
 
-    const val BASE_URL = "https://new-kbbi-api.herokuapp.com"
-
-}
+    const val BASE_URL = "https://new-kbbi-api.up.railway.app"
+}
diff --git a/app/version.properties b/app/version.properties
@@ -1,8 +1,8 @@
-#Sat Nov 05 20:06:33 WIB 2022
+#Sat Jan 14 22:15:19 WIB 2023
 VERSION_ALPHA=0
 VERSION_MINOR=0
-VERSION_DEV=1
-VERSION_MAJOR=1
-VERSION_CODE=1
+VERSION_DEV=2
+VERSION_MAJOR=2
+VERSION_CODE=2
 VERSION_BETA=0
 VERSION_MAINTENANCE=0
diff --git a/build.gradle b/build.gradle
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -0,0 +1,24 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath("com.google.gms:google-services:4.3.13")
+        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.4.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+tasks.register("clean", Delete::class) {
+    delete(rootProject.buildDir)
+}
diff --git a/settings.gradle b/settings.gradle
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -0,0 +1,2 @@
+rootProject.name = "KBBI Kamus Besar Bahasa Indonesia"
+include(":app")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		rootProject.name = "KBBI Kamus Besar Bahasa Indonesia"
		include(":app")