From 38bb55d7648d7dd9e369f89622d9d5e3a1b7cfc5 Mon Sep 17 00:00:00 2001 From: Ahn-seokjoo Date: Mon, 13 May 2024 23:42:16 +0900 Subject: [PATCH 1/9] =?UTF-8?q?[feature]=20Build=20CI=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Build.yaml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/Build.yaml diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml new file mode 100644 index 00000000..d66d6cfe --- /dev/null +++ b/.github/workflows/Build.yaml @@ -0,0 +1,33 @@ +name: Android CI + +on: + pull_request: + branches: [ "feature**", "hotfix**", "release**" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: set up JDK 18 + uses: actions/setup-java@v3 + with: + java-version: '18' + distribution: 'temurin' + cache: gradle + + - name: Cache Gradle Packages + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/buildSrc/**/*.kt') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build From 89a4802908dff57591cad18032be74ea26dbfb66 Mon Sep 17 00:00:00 2001 From: Ahn-seokjoo Date: Mon, 13 May 2024 23:44:42 +0900 Subject: [PATCH 2/9] =?UTF-8?q?[refactoring]=20=EB=84=A4=EC=9D=B4=EB=B0=8D?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/{Build.yaml => build.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{Build.yaml => build.yaml} (100%) diff --git a/.github/workflows/Build.yaml b/.github/workflows/build.yaml similarity index 100% rename from .github/workflows/Build.yaml rename to .github/workflows/build.yaml From 0074659b6f046d79560e6f62a1fa7c886b3185c4 Mon Sep 17 00:00:00 2001 From: Ahn-seokjoo Date: Mon, 13 May 2024 23:47:35 +0900 Subject: [PATCH 3/9] =?UTF-8?q?[feature]=20lint=20check=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/lint_check.yaml | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/lint_check.yaml diff --git a/.github/workflows/lint_check.yaml b/.github/workflows/lint_check.yaml new file mode 100644 index 00000000..825ebac5 --- /dev/null +++ b/.github/workflows/lint_check.yaml @@ -0,0 +1,35 @@ +name: Lint Check + +on: + pull_request: + branches: + - '*' + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: set up JDK 18 + uses: actions/setup-java@v3 + with: + java-version: '18' + distribution: 'temurin' + cache: gradle + + - name: Cache Gradle Packages + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/buildSrc/**/*.kt') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Lint Check + run: ./gradlew spotlessCheck From 0907b0e02336ba809b2016cb563820e78ff0c448 Mon Sep 17 00:00:00 2001 From: Ahn-seokjoo Date: Mon, 13 May 2024 23:52:20 +0900 Subject: [PATCH 4/9] =?UTF-8?q?[refactoring]=20lint=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/lint_check.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/lint_check.yaml b/.github/workflows/lint_check.yaml index 825ebac5..dddf9ff9 100644 --- a/.github/workflows/lint_check.yaml +++ b/.github/workflows/lint_check.yaml @@ -1,9 +1,6 @@ name: Lint Check -on: - pull_request: - branches: - - '*' +on: pull_request jobs: build: From c93f4656947560816e9935b7ea53c52224117ae8 Mon Sep 17 00:00:00 2001 From: Ahn-seokjoo Date: Mon, 13 May 2024 23:56:04 +0900 Subject: [PATCH 5/9] =?UTF-8?q?[refactoring]=20=EB=84=A4=EC=9D=B4=EB=B0=8D?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/lint_check.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/lint_check.yaml b/.github/workflows/lint_check.yaml index dddf9ff9..e87c38e1 100644 --- a/.github/workflows/lint_check.yaml +++ b/.github/workflows/lint_check.yaml @@ -3,8 +3,7 @@ name: Lint Check on: pull_request jobs: - build: - + lint-check: runs-on: ubuntu-latest steps: From 045c97d2a275bb1cadf7f6604886cc58087870d2 Mon Sep 17 00:00:00 2001 From: Ahn-seokjoo Date: Tue, 14 May 2024 00:59:57 +0900 Subject: [PATCH 6/9] =?UTF-8?q?[refactoring]=20unresolved=20reference=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 7 +++---- gradle/libs.versions.toml | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0dcd6a5f..e558f7fe 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -73,8 +73,7 @@ dependencies { implementation(libs.hilt.android) kapt(libs.hilt.compiler) - debugImplementation(libs.flipper) - debugImplementation(libs.soloader) - debugImplementation(libs.flipper.network) - releaseImplementation(libs.noop) + implementation(libs.flipper) + implementation(libs.soloader) + implementation(libs.flipper.network) } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2f4eaaff..e6f61007 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,6 @@ kotlin-serialization = "1.9.22" json-serialization = "1.6.3" flipper = "0.250.0" soloader = "0.10.5" -noop = "0.252.0" [libraries] @@ -46,7 +45,6 @@ appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "a material = { group = "com.google.android.material", name = "material", version.ref = "material" } flipper = { group = "com.facebook.flipper", name = "flipper", version.ref = "flipper" } soloader = { group = "com.facebook.soloader", name = "soloader", version.ref = "soloader" } -noop = { group = "com.facebook.flipper", name = "flipper-noop", version.ref = "flipper" } flipper-network = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref = "flipper" } navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" } From 5ac4d124b79448ac22e3b18ac7fb1bbb887759ef Mon Sep 17 00:00:00 2001 From: Ahn-seokjoo Date: Tue, 14 May 2024 01:10:14 +0900 Subject: [PATCH 7/9] =?UTF-8?q?[feature]=20spotless=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 ++-- .../main/java/com/mashup/dorabangs/MyApplication.kt | 6 +++--- domain/build.gradle.kts | 2 +- domain/src/main/kotlin/SampleUseCase.kt | 2 +- domain/src/test/kotlin/SampleUseCaseTest.kt | 2 +- presenter/build.gradle.kts | 4 ++-- .../com/mashup/dorabangs/presenter/MainActivity.kt | 2 +- .../com/mashup/dorabangs/presenter/ui/theme/Theme.kt | 10 +++++----- .../com/mashup/dorabangs/presenter/ui/theme/Type.kt | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e558f7fe..2be32a02 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -40,7 +40,7 @@ android { isShrinkResources = true proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" + "proguard-rules.pro", ) } } @@ -76,4 +76,4 @@ dependencies { implementation(libs.flipper) implementation(libs.soloader) implementation(libs.flipper.network) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mashup/dorabangs/MyApplication.kt b/app/src/main/java/com/mashup/dorabangs/MyApplication.kt index acb0484d..f8b83c04 100644 --- a/app/src/main/java/com/mashup/dorabangs/MyApplication.kt +++ b/app/src/main/java/com/mashup/dorabangs/MyApplication.kt @@ -23,8 +23,8 @@ class MyApplication : Application() { addPlugin( InspectorFlipperPlugin( this@MyApplication, - DescriptorMapping.withDefaults() - ) + DescriptorMapping.withDefaults(), + ), ) addPlugin(CrashReporterPlugin.getInstance()) // addPlugin(flipperNetworkPlugin) @@ -33,4 +33,4 @@ class MyApplication : Application() { client.start() } } -} \ No newline at end of file +} diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index 0ec715ca..ae2db9c5 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -23,4 +23,4 @@ tasks.register("dorabangs") { group = "verification" description = "Run tests and generate jacoco report" dependsOn("test", "jacocoTestReport") -} \ No newline at end of file +} diff --git a/domain/src/main/kotlin/SampleUseCase.kt b/domain/src/main/kotlin/SampleUseCase.kt index edb7ffab..b761dc24 100644 --- a/domain/src/main/kotlin/SampleUseCase.kt +++ b/domain/src/main/kotlin/SampleUseCase.kt @@ -6,4 +6,4 @@ class SampleUseCase { println("너는 가짜 바보야") } } -} \ No newline at end of file +} diff --git a/domain/src/test/kotlin/SampleUseCaseTest.kt b/domain/src/test/kotlin/SampleUseCaseTest.kt index 41c0f8ca..b624e126 100644 --- a/domain/src/test/kotlin/SampleUseCaseTest.kt +++ b/domain/src/test/kotlin/SampleUseCaseTest.kt @@ -8,4 +8,4 @@ class SampleUseCaseTest { fun test() { test.baboTest(true) } -} \ No newline at end of file +} diff --git a/presenter/build.gradle.kts b/presenter/build.gradle.kts index 66b49aa2..f1197b80 100644 --- a/presenter/build.gradle.kts +++ b/presenter/build.gradle.kts @@ -22,7 +22,7 @@ android { isMinifyEnabled = true proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" + "proguard-rules.pro", ) } } @@ -67,4 +67,4 @@ dependencies { implementation(libs.hilt.android) kapt(libs.hilt.compiler) implementation(libs.hilt.navigation.compose) -} \ No newline at end of file +} diff --git a/presenter/src/main/java/com/mashup/dorabangs/presenter/MainActivity.kt b/presenter/src/main/java/com/mashup/dorabangs/presenter/MainActivity.kt index 32a875c2..224918fa 100644 --- a/presenter/src/main/java/com/mashup/dorabangs/presenter/MainActivity.kt +++ b/presenter/src/main/java/com/mashup/dorabangs/presenter/MainActivity.kt @@ -12,4 +12,4 @@ class MainActivity : ComponentActivity() { Text("바보야") } } -} \ No newline at end of file +} diff --git a/presenter/src/main/java/com/mashup/dorabangs/presenter/ui/theme/Theme.kt b/presenter/src/main/java/com/mashup/dorabangs/presenter/ui/theme/Theme.kt index a780ed17..6cee303c 100644 --- a/presenter/src/main/java/com/mashup/dorabangs/presenter/ui/theme/Theme.kt +++ b/presenter/src/main/java/com/mashup/dorabangs/presenter/ui/theme/Theme.kt @@ -18,13 +18,13 @@ import androidx.core.view.WindowCompat private val DarkColorScheme = darkColorScheme( primary = Purple80, secondary = PurpleGrey80, - tertiary = Pink80 + tertiary = Pink80, ) private val LightColorScheme = lightColorScheme( primary = Purple40, secondary = PurpleGrey40, - tertiary = Pink40 + tertiary = Pink40, /* Other default colors to override background = Color(0xFFFFFBFE), @@ -34,7 +34,7 @@ private val LightColorScheme = lightColorScheme( onTertiary = Color.White, onBackground = Color(0xFF1C1B1F), onSurface = Color(0xFF1C1B1F), - */ + */ ) @Composable @@ -42,7 +42,7 @@ fun DorabangsTheme( darkTheme: Boolean = isSystemInDarkTheme(), // Dynamic color is available on Android 12+ dynamicColor: Boolean = true, - content: @Composable () -> Unit + content: @Composable () -> Unit, ) { val colorScheme = when { dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { @@ -65,6 +65,6 @@ fun DorabangsTheme( MaterialTheme( colorScheme = colorScheme, typography = Typography, - content = content + content = content, ) } diff --git a/presenter/src/main/java/com/mashup/dorabangs/presenter/ui/theme/Type.kt b/presenter/src/main/java/com/mashup/dorabangs/presenter/ui/theme/Type.kt index c53f4134..9a8c8842 100644 --- a/presenter/src/main/java/com/mashup/dorabangs/presenter/ui/theme/Type.kt +++ b/presenter/src/main/java/com/mashup/dorabangs/presenter/ui/theme/Type.kt @@ -13,8 +13,8 @@ val Typography = Typography( fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 24.sp, - letterSpacing = 0.5.sp - ) + letterSpacing = 0.5.sp, + ), /* Other default text styles to override titleLarge = TextStyle( fontFamily = FontFamily.Default, @@ -30,5 +30,5 @@ val Typography = Typography( lineHeight = 16.sp, letterSpacing = 0.5.sp ) - */ + */ ) From 75db5042eb0cddd3bf5576013c92ee589603bbdd Mon Sep 17 00:00:00 2001 From: Ahn-seokjoo Date: Tue, 14 May 2024 01:10:53 +0900 Subject: [PATCH 8/9] =?UTF-8?q?[feature]=20develop=20=EB=A8=B8=EC=A7=80?= =?UTF-8?q?=EC=97=90=EB=8F=84=20=EB=B9=8C=EB=93=9C=20=EC=88=98=ED=96=89=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d66d6cfe..bbe42092 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,7 +2,7 @@ name: Android CI on: pull_request: - branches: [ "feature**", "hotfix**", "release**" ] + branches: [ "feature**", "hotfix**", "release**", "develop" ] jobs: build: From da7bda7f775488dd802e40bb44538bf6812bd862 Mon Sep 17 00:00:00 2001 From: Ahn-seokjoo Date: Tue, 14 May 2024 01:11:26 +0900 Subject: [PATCH 9/9] =?UTF-8?q?[feature]=20=EB=A7=88=EC=8A=A4=ED=84=B0?= =?UTF-8?q?=EB=8F=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bbe42092..e75fa6ad 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,7 +2,7 @@ name: Android CI on: pull_request: - branches: [ "feature**", "hotfix**", "release**", "develop" ] + branches: [ "feature**", "hotfix**", "release**", "develop", "master" ] jobs: build: