Merge pull request #127 from KakaoCup/prepare-release

Prepare release
KakaoCup · Jul 7, 2024 · 46d5acf · 46d5acf
2 parents a0216bf + 6cd899e
commit 46d5acf
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 17 deletions.
diff --git a/.danger/pr_detekt.df.kts b/.danger/pr_detekt.df.kts
@@ -0,0 +1,24 @@
+@file:DependsOn("io.github.vacxe.danger.kotlin:detekt:1.1.0")
+
+import systems.danger.kotlin.*
+import systems.danger.kotlin.models.github.*
+import io.github.vacxe.danger.kotlin.detekt.*
+import java.io.File
+
+val detektPlugin = DetektPlugin { it.removePrefix("/home/runner/work/Kakao/Kakao/") }
+register.plugin(detektPlugin)
+
+danger(args) {
+    detektReport()
+}
+
+fun detektReport() {
+    val detektReportFile = File("build/reports/detekt/detekt.xml")
+    if (!detektReportFile.exists()) {
+        warn(
+            "Detekt report not exist",
+        )
+    } else {
+        detektPlugin.parseAndReport(detektReportFile)
+    }
+}
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -11,9 +11,24 @@ jobs:
         with:
           distribution: "temurin"
           java-version: 17
+          cache: gradle
       - name: detekt
         run: |
           ./gradlew clean detekt
+      - name: Upload Detekt Artifacts
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: detektArtifacts
+          path: build/reports/detekt
+      - name: Danger
+        uses: danger/[email protected]
+        if: always()
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+           dangerfile: ".danger/pr_detekt.df.kts"
+           args: "--failOnErrors --no-publish-check"
 
   assemble-debug-apk:
     needs: [ detekt ]
@@ -26,6 +41,7 @@ jobs:
         with:
           distribution: "temurin"
           java-version: 17
+          cache: gradle
       - name: Assemble Debug APK
         run: bash ./gradlew sample:assembleDebug
       - name: Upload app APK
@@ -45,6 +61,7 @@ jobs:
         with:
           distribution: "temurin"
           java-version: 17
+          cache: gradle
       - name: Assemble Instrumental APK
         run: bash ./gradlew sample:assembleDebugAndroidTest
       - name: Upload app APK

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,36 +1,39 @@
 [versions]
-gradle = "8.5"
+gradle = "8.8"
 jvmVersion = "17"
 
 targetSdk = "34"
 compileSdk = "34"
-minSdk = "14"
+minSdk = "21"
 
-agpVersion = "8.2.1"
-kotlinVersion = "1.9.21"
+agpVersion = "8.5.0"
+kotlinVersion = "2.0.0"
 
 dokkaVersion = "1.9.10"
-appcompatVersion = "1.6.1"
+appcompatVersion = "1.7.0"
 recyclerviewVersion = "1.3.2"
-viewPager2Version = "1.0.0"
+viewPager2Version = "1.1.0"
 swiperefreshlayoutVersion = "1.1.0"
-annotationVersion = "1.3.0"
-testRunnerVersion = "1.5.2"
-testRulesVersion = "1.5.0"
+annotationVersion = "1.6.0"
+testRunnerVersion = "1.6.1"
+testRulesVersion = "1.6.1"
 
-espressoVersion = "3.5.1"
+espressoVersion = "3.6.1"
 
 junitVersion = "4.13.2"
-junitExtVersion = "1.1.5"
+junitExtVersion = "1.2.1"
 multidexVersion = "2.0.1"
-materialVersion = "1.11.0"
+materialVersion = "1.12.0"
 
 detekt = "1.17.1"
 
+guavaVersion = "33.2.1-android"
+
 githubApiVersion = "1.318"
 
 [libraries]
 com-android-tools-build-gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "agpVersion" }
+guava = { module = "com.google.guava:guava", version.ref = "guavaVersion" }
 org-jetbrains-kotlin-kotlinGradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlinVersion" }
 
 com-google-android-material = { group = "com.google.android.material", name = "material", version.ref = "materialVersion" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kakao/build.gradle.kts b/kakao/build.gradle.kts
@@ -24,6 +24,8 @@ dependencies {
 
     implementation(libs.androidx.multidex.multidex)
 
+    implementation(libs.guava)
+
     dokkaHtmlPlugin(libs.org.jetbrains.dokka.kotlinAsJavaPlugin)
 }
 

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/common/views/KBaseView.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/common/views/KBaseView.kt
@@ -30,8 +30,8 @@ import org.hamcrest.Matchers
  * @param T Type of your custom view. Needs to be defined to enable invoke() and perform() for descendants
  */
 @KakaoDslMarker
-open class KBaseView<T> : KDSLView<T>, BaseActions, BaseAssertions, Interceptable<ViewInteraction, ViewAssertion, ViewAction> {
-    override val view: ViewInteractionDelegate
+abstract class KBaseView<T> : KDSLView<T>, BaseActions, BaseAssertions, Interceptable<ViewInteraction, ViewAssertion, ViewAction> {
+    final override val view: ViewInteractionDelegate
     override var root: Matcher<Root> = RootMatchers.DEFAULT
 
     /**

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/progress/PreciseSwipe.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/progress/PreciseSwipe.kt
@@ -7,7 +7,7 @@ import android.util.Log
 import androidx.test.espresso.UiController
 import androidx.test.espresso.action.MotionEvents
 import androidx.test.espresso.action.Swiper
-import androidx.test.espresso.core.internal.deps.guava.base.Preconditions.checkElementIndex
+import com.google.common.base.Preconditions.checkElementIndex
 
 object PreciseSwipe : Swiper {
     override fun sendSwipe(

diff --git a/kakao/version b/kakao/version
@@ -1 +1 @@
-3.5.1
+3.6.0