Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update main #668

Merged
merged 73 commits into from
Jun 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
6b0fe93
chore: change padding 16.dp to 32.dp
kosenda Jun 2, 2024
c3e5bda
Merge pull request #639 from kosenda/chore/change-transition-button-p…
kosenda Jun 2, 2024
fb49faa
feature: add lint job
kosenda Jun 2, 2024
e0868b0
test
kosenda Jun 2, 2024
28669dc
fix: config
kosenda Jun 2, 2024
72f5a59
chore: delete --path vendor/bundle
kosenda Jun 2, 2024
e057fbd
fix: add -
kosenda Jun 2, 2024
2fdb31d
fix: danger command options
kosenda Jun 2, 2024
7c3a007
chore: delete jacoco report
kosenda Jun 2, 2024
3026e0a
chore: change path
kosenda Jun 2, 2024
f66917d
test: add lint xmlReport = true
kosenda Jun 2, 2024
213fef3
test: remove inline_mode
kosenda Jun 2, 2024
62d0aa6
test
kosenda Jun 2, 2024
4fe57b8
chore: restore comment option
kosenda Jun 2, 2024
af40d9a
Merge pull request #640 from kosenda/feature/add-lint-job
kosenda Jun 2, 2024
3547483
chore: remove AndroidApplicationPlugin
kosenda Jun 2, 2024
b9e523c
Merge pull request #641 from kosenda/chore/remove-android-application…
kosenda Jun 2, 2024
744796d
feature: versionUp 2.1.0
kosenda Jun 3, 2024
e23873c
Merge pull request #642 from kosenda/feature/versionUp-LazyColumnScro…
kosenda Jun 3, 2024
8975dca
fix(deps): update dependency com.airbnb.android:showkase-annotation t…
renovate[bot] Jun 4, 2024
e298fd2
Merge pull request #643 from kosenda/renovate/showkase
kosenda Jun 4, 2024
8f0e44d
feature: apply edge to edge
kosenda Jun 4, 2024
c709747
Merge pull request #644 from kosenda/feature/license-licensedetail-ch…
kosenda Jun 4, 2024
70df416
fix(deps): update dependency com.pinterest.ktlint:ktlint-cli to v1.3.0
renovate[bot] Jun 5, 2024
7477fdf
fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-serializat…
renovate[bot] Jun 6, 2024
276d0de
Merge pull request #645 from kosenda/renovate/ktlint
kosenda Jun 6, 2024
df36132
chore(deps): update dependency com.google.devtools.ksp to v2.0.0-1.0.22
renovate[bot] Jun 6, 2024
650f208
Merge pull request #646 from kosenda/renovate/ksp
kosenda Jun 7, 2024
7939333
Merge pull request #647 from kosenda/renovate/kotlinxserializationjson
kosenda Jun 8, 2024
e00c12d
refactor: following NIA
kosenda Jun 9, 2024
399e67e
Merge pull request #650 from kosenda/refactor/settings-gradle-kts
kosenda Jun 9, 2024
452f092
refactor: move mock data and use preview parameter
kosenda Jun 9, 2024
1f5ec20
chore: fix add a line
kosenda Jun 9, 2024
fbdb291
Merge pull request #651 from kosenda/refactor/mock-convert-history-da…
kosenda Jun 9, 2024
a6a4512
Update README.md
kosenda Jun 9, 2024
d1ace69
feature: use ColumnScrollbar in ConvertHistoryDetailDialog
kosenda Jun 9, 2024
10ba931
Merge pull request #652 from kosenda/feature/convert-history-detail-d…
kosenda Jun 9, 2024
7b1c583
feature: add MoveTopButton in ConvertHistoryDetailDialog
kosenda Jun 10, 2024
23dc56f
chore(deps): update androidgradleplugin to v8.4.2
renovate[bot] Jun 10, 2024
cf626b6
Merge pull request #653 from kosenda/feature/convert-history-detail-d…
kosenda Jun 11, 2024
3fe8dc9
Merge pull request #654 from kosenda/renovate/androidgradleplugin
kosenda Jun 11, 2024
d9d693f
fix(deps): update androidxcompose to v1.6.8
renovate[bot] Jun 12, 2024
49cedc7
fix(deps): update androidxlifecycle to v2.8.2
renovate[bot] Jun 12, 2024
c662c61
chore(deps): update androidgradleplugin to v8.5.0
renovate[bot] Jun 13, 2024
9c10738
Merge pull request #655 from kosenda/renovate/androidxcompose
kosenda Jun 14, 2024
7ea5a54
Merge pull request #657 from kosenda/renovate/androidgradleplugin
kosenda Jun 14, 2024
5ecda5b
Merge pull request #656 from kosenda/renovate/androidxlifecycle
kosenda Jun 14, 2024
63e6281
chore: change log priority
kosenda Jun 17, 2024
6048f54
Merge pull request #658 from kosenda/chore/timber-restrict-error-type
kosenda Jun 17, 2024
34024a3
feature: add animation in ConvertButton
kosenda Jun 17, 2024
d9eb052
Merge pull request #659 from kosenda/feature/change-convert-button-an…
kosenda Jun 17, 2024
77170b1
fix(deps): update dependency com.google.firebase:firebase-bom to v33.1.1
renovate[bot] Jun 20, 2024
b8b664c
Merge pull request #661 from kosenda/renovate/firebasebom
kosenda Jun 23, 2024
4dcf279
chore(deps): update dependency com.google.firebase.crashlytics to v3.0.2
renovate[bot] Jun 23, 2024
dac92c5
feature: add 2 konsist test
kosenda Jun 24, 2024
3f8341e
chore: delete test code
kosenda Jun 24, 2024
1341baa
chore: fix bot warn
kosenda Jun 24, 2024
9c225ff
fix: add without
kosenda Jun 24, 2024
8c1562f
chore: add a last newline
kosenda Jun 24, 2024
31fc57c
Merge pull request #662 from kosenda/feature/apply-konsist
kosenda Jun 24, 2024
950932d
fix(deps): update dependency androidx.test:core to v1.6.0
renovate[bot] Jun 24, 2024
de3eac5
Merge pull request #663 from kosenda/renovate/androidxtestcore
kosenda Jun 25, 2024
52ff244
fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-serializat…
renovate[bot] Jun 25, 2024
00c1d65
fix(deps): update dependency androidx.test:core to v1.6.1
renovate[bot] Jun 27, 2024
e7bd9df
fix(deps): update dependency com.google.truth:truth to v1.4.3
renovate[bot] Jun 27, 2024
2dd6abb
Merge pull request #666 from kosenda/renovate/truth
kosenda Jun 28, 2024
a70450f
Merge pull request #660 from kosenda/renovate/firebasecrashlyticsplugin
kosenda Jun 29, 2024
e636afc
Merge pull request #665 from kosenda/renovate/androidxtestcore
kosenda Jun 29, 2024
1fa39dd
fix(deps): update dependency androidx.navigation:navigation-compose t…
renovate[bot] Jun 29, 2024
041eed3
Merge pull request #664 from kosenda/renovate/kotlinxserializationjson
kosenda Jun 29, 2024
28831bc
Merge pull request #628 from kosenda/renovate/androidxnavigation
kosenda Jun 29, 2024
af2fbb4
feature: versionUp v1.32(43)
kosenda Jun 29, 2024
af8563a
Merge pull request #667 from kosenda/feature/versionup-v1-32
kosenda Jun 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: following NIA
kosenda committed Jun 9, 2024
commit e00c12db1214fcc2ba45eca8efa6c4fa8eb1fbf4
22 changes: 11 additions & 11 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -106,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)
15 changes: 7 additions & 8 deletions core/data/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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"))
}
9 changes: 5 additions & 4 deletions core/domain/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion core/model/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ android {
}

dependencies {
testImplementation(project(":core:testing"))
testImplementation(projects.core.testing)

// kotlinx serialization
implementation(libs.kotlinx.serialization.json)
5 changes: 3 additions & 2 deletions core/network/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -28,8 +28,9 @@ android {
}

dependencies {
implementation(project(":core:model"))
testImplementation(project(":core:testing"))
implementation(projects.core.model)
testImplementation(projects.core.testing)

implementation(libs.retrofit)
implementation(libs.retrofit.kotlinx.serialization.converter)
implementation(libs.kotlinx.serialization.json)
4 changes: 2 additions & 2 deletions core/ui/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ android {
}

dependencies {
implementation(project(":core:model"))
implementation(project(":core:resource"))
implementation(projects.core.model)
implementation(projects.core.resource)

// COIL
implementation(libs.coil)
13 changes: 7 additions & 6 deletions feature/converter/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -20,12 +20,13 @@ android {
}

dependencies {
implementation(project(":core:model"))
implementation(project(":core:domain"))
implementation(project(":core:resource"))
implementation(project(":core:ui"))
implementation(project(":core:analytics"))
testImplementation(project(":core:testing"))
implementation(projects.core.model)
implementation(projects.core.domain)
implementation(projects.core.resource)
implementation(projects.core.ui)
implementation(projects.core.analytics)
testImplementation(projects.core.testing)

implementation(libs.timber)
implementation(libs.androidx.lifecycle.viewModelCompose)
implementation(libs.lazyColumnScrollbar)
13 changes: 7 additions & 6 deletions feature/history/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -20,12 +20,13 @@ android {
}

dependencies {
implementation(project(":core:analytics"))
implementation(project(":core:model"))
implementation(project(":core:domain"))
implementation(project(":core:resource"))
implementation(project(":core:ui"))
testImplementation(project(":core:testing"))
implementation(projects.core.analytics)
implementation(projects.core.model)
implementation(projects.core.domain)
implementation(projects.core.resource)
implementation(projects.core.ui)
testImplementation(projects.core.testing)

implementation(libs.timber)
implementation(libs.androidx.lifecycle.viewModelCompose)
implementation(libs.androidx.hilt.navigation.compose)
9 changes: 5 additions & 4 deletions feature/info/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -19,10 +19,11 @@ android {
}

dependencies {
implementation(project(":core:analytics"))
implementation(project(":core:ui"))
implementation(project(":core:resource"))
implementation(project(":core:model"))
implementation(projects.core.analytics)
implementation(projects.core.ui)
implementation(projects.core.resource)
implementation(projects.core.model)

implementation(libs.androidx.hilt.navigation.compose)
implementation(libs.accompanist.webView)
implementation(libs.aboutLibraries)
13 changes: 7 additions & 6 deletions feature/setting/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -20,12 +20,13 @@ android {
}

dependencies {
implementation(project(":core:analytics"))
implementation(project(":core:ui"))
implementation(project(":core:resource"))
implementation(project(":core:model"))
implementation(project(":core:domain"))
testImplementation(project(":core:testing"))
implementation(projects.core.analytics)
implementation(projects.core.ui)
implementation(projects.core.resource)
implementation(projects.core.model)
implementation(projects.core.domain)
testImplementation(projects.core.testing)

implementation(libs.androidx.hilt.navigation.compose)
implementation(libs.androidx.appcompat)
}
16 changes: 5 additions & 11 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,29 +1,23 @@
import java.net.URL

pluginManagement {
includeBuild("build-logic")
repositories {
gradlePluginPortal()
google()
mavenCentral()
}
resolutionStrategy {
eachPlugin {
when (requested.id.id) {
"com.google.android.gms.oss-licenses-plugin" -> useModule("com.google.android.gms:oss-licenses-plugin:${requested.version}")
}
}
maven { setUrl("https://s01.oss.sonatype.org/content/repositories/snapshots") }
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
maven(url = URL("https://jitpack.io"))
maven { setUrl("https://jitpack.io") }
}
}
rootProject.name = "hiraganaconverter"

enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
include(":app")
include(":feature:converter")
include(":feature:history")