update main

.circleci/config.yml

@@ -308,25 +308,42 @@ jobs:
       - set_locale_properties
       - restore_and_save_gradle_cache
 
-  unit_test:
+  lint:
     executor: android
     steps:
       - checkout
-      - check_is_skipping_vrt
-      - get_screenshots
       - set_locale_properties
       - restore_and_save_gradle_cache
       - setup_bundle
+      - run:
+          name: Android lint
+          command: ./gradlew lint --parallel --max-workers=4
       - run:
           name: Ktlint check
           command: ./gradlew ktlintCheck --continue --parallel --max-workers=4
+      - run:
+          name: Run danger file
+          command: bundle exec danger --verbose --dangerfile="Dangerfile-lint"
+      - slack/notify:
+          event: fail
+          template: basic_fail_1
+
+  unit_test:
+    executor: android
+    steps:
+      - checkout
+      - check_is_skipping_vrt
+      - get_screenshots
+      - set_locale_properties
+      - restore_and_save_gradle_cache
+      - setup_bundle
       - unit_test:
           build_variant: ProdDebug
       - save_test_result
       - report_jacoco
       - run:
           name: Run danger file
-          command: bundle exec danger --verbose
+          command: bundle exec danger --verbose --dangerfile="Dangerfile-test"
       - push_compare_branch
       - comment_screenshot_diff
       - slack/notify:
@@ -381,6 +398,10 @@ workflows:
   test:
     jobs:
       - dependencies
+      - lint:
+          context: slack-secrets
+          requires:
+            - dependencies
       - unit_test:
           context: slack-secrets
           requires:
@@ -401,6 +422,7 @@ workflows:
       - app_distribution:
           context: slack-secrets
           requires:
+            - lint
             - unit_test
           filters:
             branches:

.github/workflows_disable/Test.yml

@@ -60,7 +60,7 @@ jobs:
         with:
           plugins_file: Gemfile
           install_path: vendor/bundle
-          danger_file: Dangerfile
+          danger_file: Dangerfile-test
           danger_id: danger-pr
         env:
           DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}

Dangerfile-lint

@@ -0,0 +1,17 @@
+# Make it more obvious that a PR is a work in progress and shouldn't be merged yet
+warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]"
+
+# Warn when there is a big PR
+warn("Big PR") if git.lines_of_code > 500
+
+# Do not show out of range issues, not caused by the current PR
+github.dismiss_out_of_range_messages
+
+checkstyle_format.base_path = Dir.pwd
+checkstyle_format.report 'build/reports/ktlint/ktlint-result.xml'
+
+Dir["**/build/reports/lint-results*.xml"].each do |file_name|
+    android_lint.skip_gradle_task = true
+    android_lint.report_file = file_name
+    android_lint.lint(inline_mode: true)
+end

Dangerfile-test

@@ -0,0 +1,5 @@
+# Don't let testing shortcuts get into master by accident
+fail("fdescribe left in tests") if `grep -r fdescribe specs/ `.length > 1
+fail("fit left in tests") if `grep -r fit specs/ `.length > 1
+
+jacoco.report("build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml",  fail_no_coverage_data_found: false)

Gemfile

@@ -2,4 +2,5 @@ source "https://rubygems.org"
 git_source(:github) { |repo_name| "https://github.com/kosenda/SimpleCompoundInterestCalculation" }
 gem 'danger', '~> 9.4.0'
 gem "danger-checkstyle_format"
-gem "danger-jacoco"
+gem "danger-jacoco"
+gem 'danger-android_lint'

README.md

@@ -67,16 +67,16 @@ https://github.com/kosenda/hiragana-converter/blob/develop/REFERENCE.md
 ## Image
 |Conversion screen(Light)|Conversion screen(Dark)|
 |:-:|:-:|
-|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/af920334-fd73-40b4-803c-525d0cc64f21">|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/9a67591f-cd1e-4184-9d79-79a3f69f69af">|
+|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/5ac9e2e0-461f-4401-bd13-934459f7941a">|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/f82f2f13-f117-48fd-83dc-eee19aa1318c">|
 
 |Setting screen(Light)|Setting screen(Dark)|
 |:-:|:-:|
-|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/2ad5a49f-eaed-425d-8b66-83ec84223582">|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/d8d47e0e-06ea-4131-be83-cb11c2e5dcc3">|
+|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/e46a5c3d-a84d-493c-88c1-21a26dfc8d2d">|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/c467a50e-f4b9-4311-bc6a-de196587de0f">|
 
 |History screen(Light)|History screen(Dark)|
 |:-:|:-:|
-|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/24908a61-184b-4768-adfa-c3361d365549">|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/a7a3ef8f-cbdd-4b27-b17e-c8f7f2a3af79">|
+|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/c61537ae-3733-4392-9fa8-240f6b4a659e">|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/dea7436c-3617-433c-b5fb-4310e660c69b">|
 
 |Info screen(Light)|Info screen(Dark)|
 |:-:|:-:|
-|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/708f10fb-d93c-4d28-91d1-7b5a25c543ec">|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/718a2722-3ab9-48f7-95be-65efe6a9112c">|
+|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/2abd8765-8db6-4df3-b558-637b90f99ed1">|<img width="280" alt="convert_screen" src="https://github.com/kosenda/hiragana-converter/assets/60963155/34326658-e6e8-479c-9e8f-584cce36cbc2">|

app/build.gradle.kts

@@ -1,9 +1,12 @@
 import com.google.firebase.perf.plugin.FirebasePerfExtension
+import ksnd.hiraganaconverter.kotlinOptions
 import java.io.FileInputStream
 import java.util.Properties
 
 plugins {
-    id("hiraganaconverter.android.application")
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("hiraganaconverter.android.application.jacoco")
     id("hiraganaconverter.android.hilt")
     alias(libs.plugins.kotlin.serialization)
@@ -19,14 +22,28 @@ plugins {
 
 android {
     namespace = "ksnd.hiraganaconverter"
-
+    compileSdk = 34
+    defaultConfig {
+        applicationId = "ksnd.hiraganaconverter"
+        minSdk = 26
+        targetSdk = 34
+        versionCode = 43
+        versionName = "1.32"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
     androidResources {
         generateLocaleConfig = true
     }
 
     // ref: https://github.com/DroidKaigi/conference-app-2023/blob/main/app-android/build.gradle.kts
     val keystorePropertiesFile = file("keystore.properties")
-
     signingConfigs {
         if (keystorePropertiesFile.exists()) {
             val keystoreProperties = Properties()
@@ -39,7 +56,6 @@ android {
             }
         }
     }
-
     buildTypes {
         release {
             isShrinkResources = true
@@ -60,7 +76,6 @@ android {
             }
         }
     }
-
     flavorDimensions += "env"
     productFlavors {
         create("prod") {
@@ -91,17 +106,17 @@ android {
 }
 
 dependencies {
-    implementation(project(":feature:converter"))
-    implementation(project(":feature:history"))
-    implementation(project(":feature:info"))
-    implementation(project(":feature:setting"))
-    implementation(project(":core:analytics"))
-    implementation(project(":core:model"))
-    implementation(project(":core:resource"))
-    implementation(project(":core:domain"))
-    implementation(project(":core:data"))
-    implementation(project(":core:ui"))
-    testImplementation(project(":core:testing"))
+    implementation(projects.feature.converter)
+    implementation(projects.feature.history)
+    implementation(projects.feature.info)
+    implementation(projects.feature.setting)
+    implementation(projects.core.analytics)
+    implementation(projects.core.model)
+    implementation(projects.core.resource)
+    implementation(projects.core.domain)
+    implementation(projects.core.data)
+    implementation(projects.core.ui)
+    testImplementation(projects.core.testing)
 
     implementation(libs.androidx.activity)
     implementation(libs.androidx.appcompat)

app/src/main/java/ksnd/hiraganaconverter/view/Application.kt

@@ -23,14 +23,11 @@ private class ReleaseTree : Timber.Tree() {
         message: String,
         t: Throwable?,
     ) {
-        val priorityStr =
-            when (priority) {
-                Log.ERROR -> "E/"
-                Log.WARN -> "W/"
-                Log.INFO -> "I/"
-                Log.DEBUG -> "D/"
-                else -> return
-            }
+        val priorityStr = when (priority) {
+            Log.ERROR -> "E/"
+            Log.WARN -> "W/"
+            else -> return // Ignore other log levels
+        }
         Firebase.crashlytics.log(
             "%s%s%s".format(
                 priorityStr,

app/src/test/java/ksnd/hiraganaconverter/KonsistTest.kt

@@ -0,0 +1,29 @@
+package ksnd.hiraganaconverter
+
+import com.lemonappdev.konsist.api.Konsist
+import com.lemonappdev.konsist.api.ext.list.withNameMatching
+import com.lemonappdev.konsist.api.ext.list.withoutAnnotationNamed
+import com.lemonappdev.konsist.api.verify.assertFalse
+import com.lemonappdev.konsist.api.verify.assertTrue
+import org.junit.Test
+
+class KonsistTest {
+    // ref: https://docs.konsist.lemonappdev.com/inspiration/snippets/general-snippets#id-10.-no-empty-files-allowed
+    @Test
+    fun `no empty files allowed`() {
+        Konsist
+            .scopeFromProject()
+            .files
+            .assertFalse { it.text.isEmpty() }
+    }
+
+    @Test
+    fun `functions containing 'Preview' must start with 'Preview'`() {
+        Konsist
+            .scopeFromProject()
+            .functions()
+            .withNameMatching(Regex(".*Preview.*"))
+            .withoutAnnotationNamed("Test")
+            .assertTrue { it.hasNameStartingWith("Preview") }
+    }
+}

build-logic/convention/build.gradle.kts

@@ -17,10 +17,6 @@ dependencies {
 
 gradlePlugin {
     plugins {
-        register("androidApplication") {
-            id = "hiraganaconverter.android.application"
-            implementationClass = "ksnd.hiraganaconverter.AndroidApplicationPlugin"
-        }
         register("androidApplicationJacoco") {
             id = "hiraganaconverter.android.application.jacoco"
             implementationClass = "ksnd.hiraganaconverter.AndroidApplicationJacocoPlugin"

core/data/build.gradle.kts

@@ -25,11 +25,13 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:resource"))
-    implementation(project(":core:model"))
-    implementation(project(":core:domain"))
-    implementation(project(":core:network"))
-    testImplementation(project(":core:testing"))
+    implementation(projects.core.resource)
+    implementation(projects.core.model)
+    implementation(projects.core.domain)
+    implementation(projects.core.network)
+    implementation(projects.core.analytics)
+    testImplementation(projects.core.testing)
+
     implementation(libs.androidx.dataStore.preferences)
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.timber)
@@ -44,7 +46,4 @@ dependencies {
     // App Review
     implementation(libs.app.review)
     implementation(libs.app.review.ktx)
-
-    // Analytics
-    implementation(project(":core:analytics"))
 }

core/domain/build.gradle.kts

@@ -19,10 +19,11 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:analytics"))
-    implementation(project(":core:model"))
-    implementation(project(":core:resource"))
-    testImplementation(project(":core:testing"))
+    implementation(projects.core.analytics)
+    implementation(projects.core.model)
+    implementation(projects.core.resource)
+    testImplementation(projects.core.testing)
+
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.retrofit)
     implementation(libs.okhttp3)