Skip to content

Commit 12a3361

Browse files
easyhoooneasyhooon
committed
Merge remote-tracking branch 'origin/develop' into BOOK-256-feature/#139
# Conflicts: # feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/record/RecordDetailPresenter.kt # feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/register/RecordRegisterPresenter.kt # feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/ImpressionStep.kt # feature/screens/src/main/kotlin/com/ninecraft/booket/feature/screens/Screens.kt # feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/BookSearchPresenter.kt # feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/SettingsPresenter.kt # feature/splash/src/main/kotlin/com/ninecraft/booket/splash/SplashPresenter.kt # gradle/libs.versions.toml
2 parents 992ff4f + cac3c81 commit 12a3361

File tree

71 files changed

+1462
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1462
-288
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,18 @@
6060

6161
</activity>
6262

63+
<provider
64+
android:name="androidx.core.content.FileProvider"
65+
android:authorities="${applicationId}.provider"
66+
android:exported="false"
67+
android:grantUriPermissions="true">
68+
69+
<meta-data
70+
android:name="android.support.FILE_PROVIDER_PATHS"
71+
android:resource="@xml/provider_paths"
72+
tools:replace="android:resource" />
73+
</provider>
74+
6375
</application>
6476

6577
</manifest>

core/designsystem/src/main/res/xml/backup_rules.xml renamed to app/src/main/res/xml/backup_rules.xml

File renamed without changes.

core/designsystem/src/main/res/xml/data_extraction_rules.xml renamed to app/src/main/res/xml/data_extraction_rules.xml

File renamed without changes.

core/designsystem/src/main/res/xml/network_security_config.xml renamed to app/src/main/res/xml/network_security_config.xml

File renamed without changes.

‎app/src/main/res/xml/provider_paths.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<paths>
4+
<external-path
5+
name="external_files"
6+
path="." />
7+
<root-path
8+
name="root"
9+
path="." />
10+
</paths>
11+
</resources>

‎build-logic/src/main/kotlin/AndroidApplicationConventionPlugin.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import com.ninecraft.booket.convention.ApplicationConstants
33
import com.ninecraft.booket.convention.Plugins
44
import com.ninecraft.booket.convention.applyPlugins
55
import com.ninecraft.booket.convention.configureAndroid
6+
import com.ninecraft.booket.convention.libs
67
import org.gradle.api.Plugin
78
import org.gradle.api.Project
89
import org.gradle.kotlin.dsl.configure
@@ -19,9 +20,9 @@ internal class AndroidApplicationConventionPlugin : Plugin<Project> {
1920
configureAndroid(this)
2021

2122
defaultConfig {
22-
targetSdk = ApplicationConstants.TARGET_SDK
23-
versionName = ApplicationConstants.VERSION_NAME
24-
versionCode = ApplicationConstants.VERSION_CODE
23+
targetSdk = libs.versions.targetSdk.get().toInt()
24+
versionName = libs.versions.versionName.get()
25+
versionCode = libs.versions.versionCode.get().toInt()
2526
}
2627
}
2728
}

‎build-logic/src/main/kotlin/AndroidLibraryConventionPlugin.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import com.android.build.gradle.LibraryExtension
22
import com.ninecraft.booket.convention.Plugins
33
import com.ninecraft.booket.convention.applyPlugins
44
import com.ninecraft.booket.convention.configureAndroid
5+
import com.ninecraft.booket.convention.libs
56
import org.gradle.api.Plugin
67
import org.gradle.api.Project
78
import org.gradle.kotlin.dsl.configure
8-
import com.ninecraft.booket.convention.ApplicationConstants
99

1010
internal class AndroidLibraryConventionPlugin : Plugin<Project> {
1111
override fun apply(target: Project) {
@@ -19,7 +19,7 @@ internal class AndroidLibraryConventionPlugin : Plugin<Project> {
1919
configureAndroid(this)
2020

2121
defaultConfig.apply {
22-
targetSdk = ApplicationConstants.TARGET_SDK
22+
targetSdk = libs.versions.targetSdk.get().toInt()
2323
}
2424
}
2525
}

‎build-logic/src/main/kotlin/com/ninecraft/booket/convention/Android.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
88

99
internal fun Project.configureAndroid(extension: CommonExtension<*, *, *, *, *, *>) {
1010
extension.apply {
11-
compileSdk = ApplicationConstants.COMPILE_SDK
11+
compileSdk = libs.versions.compileSdk.get().toInt()
1212

1313
defaultConfig {
14-
minSdk = ApplicationConstants.MIN_SDK
14+
minSdk = libs.versions.minSdk.get().toInt()
1515
}
1616

1717
compileOptions {

‎build-logic/src/main/kotlin/com/ninecraft/booket/convention/ApplicationConstants.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ package com.ninecraft.booket.convention
33
import org.gradle.api.JavaVersion
44

55
internal object ApplicationConstants {
6-
const val MIN_SDK = 28
7-
const val TARGET_SDK = 35
8-
const val COMPILE_SDK = 35
9-
const val VERSION_CODE = 3
10-
const val VERSION_NAME = "1.0.0"
116
const val JAVA_VERSION_INT = 17
127
val javaVersion = JavaVersion.VERSION_17
138
}

‎core/common/build.gradle.kts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ plugins {
99

1010
android {
1111
namespace = "com.ninecraft.booket.core.common"
12+
13+
buildFeatures {
14+
buildConfig = true
15+
}
16+
17+
defaultConfig {
18+
buildConfigField("String", "PACKAGE_NAME", "\"${libs.versions.packageName.get()}\"")
19+
}
1220
}
1321

1422
dependencies {

0 commit comments

Comments
 (0)