🔗 :: v1.2.4

.github/workflows/android.yml

@@ -2,9 +2,13 @@ name: Android CI
 
 on:
   push:
-    branches: [ master, develop ]
+    branches:
+      - develop
+      - main
   pull_request:
-    branches: [ master, develop ]
+    branches: 
+      - develop
+      - main
 
 jobs:
   build:
@@ -13,15 +17,20 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 17
+      - name: set up JDK 18
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '18'
           distribution: 'temurin'
           cache: gradle
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+      - name: Create local.properties
+        run: echo '${{ secrets.LOCAL_PROPERTIES }}' > ./local.properties
+      - name: Create google-services.json
+        run: cat /home/runner/work/JOBIS-DSM-ANDROID/JOBIS-DSM-ANDROID/presentation/google-services.json | base64
+      - name: Putting google-services.json data
+        env:
+          DATA: ${{ secrets.GOOGLE_SERVICES_JSON }}
+        run: echo $DATA > /home/runner/work/JOBIS-DSM-ANDROID/JOBIS-DSM-ANDROID/presentation/google-services.json
       - name: Build with Gradle
         run: ./gradlew build
       - name: Run test

.gitignore

@@ -27,8 +27,6 @@ buildSrc/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.value
 
 .idea/gradle.xml
 
-gradle/wrapper/gradle-wrapper.properties
-
 .gradle/7.4/checksums/md5-checksums.bin
 
 .gradle/7.4/checksums/sha1-checksums.bin
@@ -779,3 +777,125 @@ presentation/google-services.json
 presentation/release/presentation-release.aab
 
 .DS_Store
+
+.gradle/8.0/checksums/checksums.lock
+
+.gradle/8.0/checksums/md5-checksums.bin
+
+.gradle/8.0/checksums/sha1-checksums.bin
+
+.gradle/8.0/dependencies-accessors/dependencies-accessors.lock
+
+.gradle/8.0/dependencies-accessors/gc.properties
+
+.gradle/8.0/executionHistory/executionHistory.bin
+
+.gradle/8.0/executionHistory/executionHistory.lock
+
+.gradle/8.0/fileChanges/last-build.bin
+
+.gradle/8.0/fileHashes/fileHashes.bin
+
+.gradle/8.0/fileHashes/fileHashes.lock
+
+.gradle/8.0/fileHashes/resourceHashesCache.bin
+
+.gradle/8.0/gc.properties
+
+.gradle/config.properties
+
+.idea/migrations.xml
+
+buildSrc/.gradle/8.0/executionHistory/executionHistory.bin
+
+buildSrc/.gradle/8.0/executionHistory/executionHistory.lock
+
+buildSrc/build/classes/kotlin/main/Dependency$COIL.class
+
+buildSrc/build/classes/kotlin/main/Dependency$GOOGLE.class
+
+buildSrc/build/classes/kotlin/main/Dependency$JODA.class
+
+buildSrc/build/classes/kotlin/main/META-INF/buildSrc.kotlin_module
+
+buildSrc/build/classes/kotlin/main/ProjectProperties.class
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab_i
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab_i.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab_i.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab_i
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab_i.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i.len
+
+buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i.len
+
+buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin
+
+buildSrc/build/pluginUnderTestMetadata/plugin-under-test-metadata.properties
+
+buildSrc/build/source-roots/buildSrc/source-roots.txt
+
+buildSrc/build/reports/plugin-development/validation-report.txt
+
+.gradle/8.2/checksums/checksums.lock
+
+.gradle/8.2/checksums/md5-checksums.bin
+
+.gradle/8.2/checksums/sha1-checksums.bin
+
+.gradle/8.2/dependencies-accessors/dependencies-accessors.lock
+
+.gradle/8.2/dependencies-accessors/gc.properties
+
+.gradle/8.2/executionHistory/executionHistory.bin
+
+.gradle/8.2/executionHistory/executionHistory.lock
+
+.gradle/8.2/fileChanges/last-build.bin
+
+.gradle/8.2/fileHashes/fileHashes.bin
+
+.gradle/8.2/fileHashes/fileHashes.lock
+
+.gradle/8.2/fileHashes/resourceHashesCache.bin
+
+.gradle/8.2/gc.properties
+
+buildSrc/.gradle/8.2/executionHistory/executionHistory.bin
+
+buildSrc/.gradle/8.2/executionHistory/executionHistory.lock

build.gradle.kts

@@ -1,12 +1,13 @@
 buildscript {
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.0")
+        classpath("com.android.tools.build:gradle:8.2.1")
         classpath("com.google.gms:google-services:4.3.15")
         classpath("com.google.firebase:firebase-appdistribution-gradle:4.0.0")
     }
 }
 plugins {
-    id("com.android.library") version "7.3.0" apply false
+    id("com.android.library") version "8.2.1" apply false
+    id("com.android.application") version "8.2.1" apply false
     id("org.jetbrains.kotlin.android") version "1.8.10" apply false
     id("com.google.dagger.hilt.android") version "2.44.2" apply false
 }

buildSrc/src/main/kotlin/Dependency.kt

@@ -37,6 +37,10 @@ object Dependency {
             "androidx.lifecycle:lifecycle-runtime-compose:${Version.COLLECT_AS_STATE_WITH_LIFECYCLE}"
     }
 
+    object GOOGLE {
+        const val APP_UPDATE = "com.google.android.play:app-update-ktx:${Version.APP_UPDATE}"
+    }
+
     object SPLASH {
         const val SPLASH_SCREEN = "androidx.core:core-splashscreen:${Version.SPLASH_SCREEN}"
     }
@@ -52,6 +56,6 @@ object Dependency {
 
     object DESIGNSYSTEM {
         const val JOBIS =
-            "com.github.Team-return.JOBIS-DESIGN-SYSTEM-ANDROID:designsystem:${Version.DESIGN_SYSTEM}"
+            "com.github.Team-return:JOBIS-DESIGN-SYSTEM-ANDROID:${Version.DESIGN_SYSTEM}"
     }
 }

buildSrc/src/main/kotlin/ProjectProperties.kt

@@ -8,13 +8,13 @@ object ProjectProperties {
     const val COMPILE_SDK = 33
     const val MIN_SDK = 24
 
-    const val VERSION_CODE = 23
-    const val VERSION_NAME = "1.2.3"
+    const val VERSION_CODE = 24
+    const val VERSION_NAME = "1.2.4"
 
     const val TEST_RUNNER = "androidx.test.runner.AndroidJUnitRunner"
 
     const val PROGUARD = "proguard-android-optimize.txt"
     const val PROGUARD_RULES = "proguard-rules.pro"
 
-    const val JVM_VERSION = "1.8"
+    const val JVM_VERSION = "18"
 }

buildSrc/src/main/kotlin/Version.kt

@@ -9,22 +9,24 @@ object Version {
     const val ANDROID_GRADLE = "7.2.1"
     const val KOTLIN_GRADLE = "1.6.10"
 
-    const val COMPOSE_LIFECYCLE = "2.5.1"
-    const val COMPOSE_ACTIVITY = "1.6.1"
-    const val COMPOSE_MATERIAL = "1.3.1"
-    const val COMPOSE_NAVIGATION = "2.5.3"
-    const val COMPOSE_NAVIGATION_HILT = "1.0.0"
-    const val COMPOSE_FLOW_LAYOUT = "0.30.1"
-    const val COMPOSE_NAVIGATION_ANIMATION = "0.30.1"
-    const val COLLECT_AS_STATE_WITH_LIFECYCLE = "2.6.0-alpha04"
+    const val COMPOSE_LIFECYCLE = "2.6.2"
+    const val COMPOSE_ACTIVITY = "1.8.1"
+    const val COMPOSE_MATERIAL = "1.5.4"
+    const val COMPOSE_NAVIGATION = "2.7.5"
+    const val COMPOSE_NAVIGATION_HILT = "1.1.0"
+    const val COMPOSE_FLOW_LAYOUT = "0.32.0"
+    const val COMPOSE_NAVIGATION_ANIMATION = "0.32.0"
+    const val COLLECT_AS_STATE_WITH_LIFECYCLE = "2.6.2"
 
-    const val SPLASH_SCREEN = "1.0.0"
+    const val APP_UPDATE = "2.1.0"
 
-    const val ORBIT_MVI = "6.0.0"
+    const val SPLASH_SCREEN = "1.0.1"
 
-    const val DESIGN_SYSTEM = "v1.2.3"
+    const val ORBIT_MVI = "6.1.0"
 
-    const val SHIMMER = "1.0.5"
+    const val DESIGN_SYSTEM = "v1.3.1"
+
+    const val SHIMMER = "1.2.0"
 
     const val JODA_TIME = "2.12.5"
 }

data/build.gradle.kts

@@ -19,22 +19,29 @@ android {
 
         testInstrumentationRunner = ProjectProperties.TEST_RUNNER
 
-        buildConfigField("String", "BASE_URL", properties.getProperty("BASE_URL"))
     }
 
     buildTypes {
         release {
             isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile(ProjectProperties.PROGUARD),
-                ProjectProperties.PROGUARD_RULES,
+            buildConfigField(
+                type = "String",
+                name = "BASE_URL",
+                value = properties.getProperty("PROD_URL", "\"\"")
+            )
+        }
+        debug{
+            buildConfigField(
+                type = "String",
+                name = "BASE_URL",
+                value = properties.getProperty("DEV_URL", "\"\"")
             )
         }
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_18
+        targetCompatibility = JavaVersion.VERSION_18
     }
     kotlinOptions {
         jvmTarget = ProjectProperties.JVM_VERSION