Merge pull request #9 from shinhyo/fix_api

shinhyo · web-flow · commit 0d33862c5a10 · 2023-01-30T22:19:51.000+09:00
fix: api
diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
   pull_request:
+
 concurrency:
   group: build-${{ github.ref }}
   cancel-in-progress: true
@@ -30,6 +31,20 @@ jobs:
           distribution: 'zulu'
           java-version: 11
 
+      - name: chmod cache key
+        run: chmod +x ./scripts/checksum.sh
+
+      - name: Generate cache key
+        run: ./scripts/checksum.sh app checksum.txt
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
+          key: gradle-${{ hashFiles('checksum.txt') }}
+
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 group = "io.github.shinhyo.brba.buildlogic"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 dependencies {
diff --git a/core/model/src/main/java/io/github/shinhyo/brba/core/model/BrbaCharacter.kt b/core/model/src/main/java/io/github/shinhyo/brba/core/model/BrbaCharacter.kt
@@ -21,14 +21,11 @@ data class BrbaCharacter(
     val charId: Long = -1,
     val name: String = "",
     val birthday: String = "",
-    val occupation: List<String> = listOf(),
     val img: String = "",
     val status: String = "",
     val nickname: String = "",
-    val appearance: List<Int> = listOf(),
     val portrayed: String = "",
     val category: String = "",
-    val betterCallSaulAppearance: List<Int> = listOf(),
     val ratio: Float = 1f,
     val favorite: Boolean = false,
     val ctime: Date? = null,
diff --git a/core/network/src/main/java/io/github/shinhyo/brba/core/network/model/Character.kt b/core/network/src/main/java/io/github/shinhyo/brba/core/network/model/Character.kt
@@ -16,33 +16,27 @@
 package io.github.shinhyo.brba.core.network.model
 
 import com.google.gson.annotations.SerializedName
+import io.github.shinhyo.brba.core.model.BrbaCharacter
 
 data class Character(
     @SerializedName("char_id")
-    val charId: Long = 0,
-    val name: String = "",
-    val birthday: String = "",
-    val occupation: List<String> = listOf(),
-    val img: String = "",
-    val status: String = "",
-    val nickname: String = "",
-    val appearance: List<Int> = listOf(),
-    val portrayed: String = "",
-    val category: String = "",
-    @SerializedName("better_call_saul_appearance")
-    val betterCallSaulAppearance: List<Int> = listOf(),
+    val charId: Long?,
+    val name: String?,
+    val birthday: String?,
+    val img: String?,
+    val status: String?,
+    val nickname: String?,
+    val portrayed: String?,
+    val category: String?,
 )
 
-fun Character.asExternalModel() = io.github.shinhyo.brba.core.model.BrbaCharacter(
-    charId = charId,
-    name = name,
-    birthday = birthday,
-    occupation = occupation,
-    img = img,
-    status = status,
-    nickname = nickname,
-    appearance = appearance,
-    portrayed = portrayed,
-    category = category,
-    betterCallSaulAppearance = betterCallSaulAppearance
+fun Character.asExternalModel() = BrbaCharacter(
+    charId = charId ?: -1,
+    name = name ?: "",
+    birthday = birthday ?: "",
+    img = img ?: "",
+    status = status ?: "",
+    nickname = nickname ?: "",
+    portrayed = portrayed ?: "",
+    category = category ?: "",
 )
diff --git a/core/network/src/main/java/io/github/shinhyo/brba/core/network/retrofit/RetrofitNetwork.kt b/core/network/src/main/java/io/github/shinhyo/brba/core/network/retrofit/RetrofitNetwork.kt
@@ -36,7 +36,7 @@ import javax.inject.Singleton
 private interface BaBrApi {
 
     companion object {
-        const val BASE_URL = "https://www.breakingbadapi.com"
+        const val BASE_URL = "https://brba.shinhyo.workers.dev"
     }
 
     @GET(value = "/api/characters")
diff --git a/feature/detail/src/main/kotlin/io/github/shinhyo/brba/feature/detail/DetailScreen.kt b/feature/detail/src/main/kotlin/io/github/shinhyo/brba/feature/detail/DetailScreen.kt
@@ -183,17 +183,11 @@ private fun Preview() {
                 charId = 0,
                 name = "Walter White",
                 birthday = "09-07-1958",
-                occupation = listOf(
-                    "High School Chemistry Teacher",
-                    "Meth King Pin"
-                ),
                 img = "img\":\"https://images.amcnetworks.com/amc.com/wp-content/uploads/2015/04/cast_bb_700x1000_walter-white-lg.jpg",
                 status = "Presumed dead",
                 nickname = "Heisenberg",
-                appearance = listOf(1, 2, 3, 4, 5),
                 portrayed = "",
                 category = "Breaking Bad",
-                betterCallSaulAppearance = listOf(),
                 ratio = 1.5f,
                 favorite = false,
                 ctime = null
diff --git a/feature/main/src/main/java/io/github/shinhyo/brba/feature/main/favorite/FavoriteScreen.kt b/feature/main/src/main/java/io/github/shinhyo/brba/feature/main/favorite/FavoriteScreen.kt
@@ -228,17 +228,12 @@ private fun Preview() {
                     charId = 0,
                     name = "Walter White",
                     birthday = "09-07-1958",
-                    occupation = listOf(
-                        "High School Chemistry Teacher",
-                        "Meth King Pin"
-                    ),
+
                     img = "img\":\"https://images.amcnetworks.com/amc.com/wp-content/uploads/2015/04/cast_bb_700x1000_walter-white-lg.jpg",
                     status = "Presumed dead",
                     nickname = "Heisenberg",
-                    appearance = listOf(1, 2, 3, 4, 5),
                     portrayed = "",
                     category = "Breaking Bad",
-                    betterCallSaulAppearance = listOf(),
                     ratio = 1.5f,
                     favorite = true,
                     ctime = null
diff --git a/feature/main/src/main/java/io/github/shinhyo/brba/feature/main/list/ListScreen.kt b/feature/main/src/main/java/io/github/shinhyo/brba/feature/main/list/ListScreen.kt
@@ -204,17 +204,11 @@ private fun Preview() {
                     charId = 0,
                     name = "Walter White",
                     birthday = "09-07-1958",
-                    occupation = listOf(
-                        "High School Chemistry Teacher",
-                        "Meth King Pin"
-                    ),
                     img = "img\":\"https://images.amcnetworks.com/amc.com/wp-content/uploads/2015/04/cast_bb_700x1000_walter-white-lg.jpg",
                     status = "Presumed dead",
                     nickname = "Heisenberg",
-                    appearance = listOf(1, 2, 3, 4, 5),
                     portrayed = "",
                     category = "Breaking Bad",
-                    betterCallSaulAppearance = listOf(),
                     ratio = 1.2f,
                     favorite = true,
                     ctime = null
@@ -223,17 +217,11 @@ private fun Preview() {
                     charId = 0,
                     name = "Walter White",
                     birthday = "09-07-1958",
-                    occupation = listOf(
-                        "High School Chemistry Teacher",
-                        "Meth King Pin"
-                    ),
                     img = "img\":\"https://images.amcnetworks.com/amc.com/wp-content/uploads/2015/04/cast_bb_700x1000_walter-white-lg.jpg",
                     status = "Presumed dead",
                     nickname = "Heisenberg",
-                    appearance = listOf(1, 2, 3, 4, 5),
                     portrayed = "",
                     category = "Breaking Bad",
-                    betterCallSaulAppearance = listOf(),
                     ratio = 1.8f,
                     favorite = false,
                     ctime = null
@@ -242,17 +230,11 @@ private fun Preview() {
                     charId = 0,
                     name = "Walter White",
                     birthday = "09-07-1958",
-                    occupation = listOf(
-                        "High School Chemistry Teacher",
-                        "Meth King Pin"
-                    ),
                     img = "img\":\"https://images.amcnetworks.com/amc.com/wp-content/uploads/2015/04/cast_bb_700x1000_walter-white-lg.jpg",
                     status = "Presumed dead",
                     nickname = "Heisenberg",
-                    appearance = listOf(1, 2, 3, 4, 5),
                     portrayed = "",
                     category = "Breaking Bad",
-                    betterCallSaulAppearance = listOf(),
                     ratio = 1.5f,
                     favorite = false,
                     ctime = null
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 targetSdk = "33"
 
-androidGradlePlugin = "7.3.1"
+androidGradlePlugin = "7.4.0"
 kotlin = "1.7.20"
 androidDesugarJdkLibs = "1.1.5"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Oct 08 16:50:13 KST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-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/scripts/checksum.sh b/scripts/checksum.sh
@@ -0,0 +1,26 @@
+# Cache check
+
+#!/bin/bash
+SAMPLE=$1
+RESULT_FILE=$2
+
+if [ -f $RESULT_FILE ]; then
+  rm $RESULT_FILE
+fi
+touch $RESULT_FILE
+
+checksum_file() {
+  echo $(openssl md5 $1 | awk '{print $2}')
+}
+
+FILES=()
+while read -r -d ''; do
+	FILES+=("$REPLY")
+done < <(find $SAMPLE -type f \( -name "build.gradle*" -o -name "gradle-wrapper.properties"  -o -name "robolectric.properties" \) -print0)
+
+# Loop through files and append MD5 to result file
+for FILE in ${FILES[@]}; do
+	echo $(checksum_file $FILE) >> $RESULT_FILE
+done
+# Now sort the file so that it is idempotent
+sort $RESULT_FILE -o $RESULT_FILE

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ plugins {`
`5`	`5`	`group = "io.github.shinhyo.brba.buildlogic"`
`6`	`6`
`7`	`7`	`java {`
`8`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`9`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`8`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`9`	`+ targetCompatibility = JavaVersion.VERSION_11`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import javax.inject.Singleton`
`36`	`36`	`private interface BaBrApi {`
`37`	`37`
`38`	`38`	`companion object {`
`39`		`- const val BASE_URL = "https://www.breakingbadapi.com"`
	`39`	`+ const val BASE_URL = "https://brba.shinhyo.workers.dev"`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@GET(value = "/api/characters")`