Skip to content

Commit edca546

Browse files
easyhoooneasyhooon
authored
Merge pull request #160 from YAPP-Github/develop
release v1.1.0
2 parents 47dca73 + d8fcc92 commit edca546

155 files changed

Lines changed: 4107 additions & 641 deletions

File tree

Some content is hidden

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

‎.github/workflows/android-cd.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ jobs:
3838
- name: Generate google-services.json
3939
run: echo '${{ secrets.GOOGLE_SERVICES }}' | base64 -d > ./app/google-services.json
4040

41-
- name: Extract Version Name from ApplicationConstants.kt
41+
- name: Extract Version Name from libs.versions.toml
4242
run: |
4343
set -euo pipefail
44-
VERSION=$(grep "VERSION_NAME" build-logic/src/main/kotlin/com/ninecraft/booket/convention/ApplicationConstants.kt | sed -E 's/.*VERSION_NAME\s*=\s*"([^"]+)".*/\1/')
44+
VERSION=$(grep "versionName" gradle/libs.versions.toml | sed -E 's/.*versionName\s*=\s*"([^"]+)".*/\1/')
4545
if [[ -z "$VERSION" ]]; then
46-
echo "Error: ApplicationConstants.kt에서 VERSION_NAME 값을 추출하지 못했습니다." >&2
46+
echo "Error: toml에서 versionName 값을 추출하지 못했습니다." >&2
4747
exit 1
4848
fi
4949
echo "version=v${VERSION}" >> "$GITHUB_OUTPUT"
50-
echo "Version extracted from ApplicationConstants.kt: v${VERSION}"
50+
echo "Version extracted from toml: v${VERSION}"
5151
id: extract_version
5252

5353
- name: Generate Firebase Release Note

‎app/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ dependencies {
8888
projects.feature.settings,
8989
projects.feature.splash,
9090
projects.feature.webview,
91+
projects.feature.edit,
9192

9293
libs.androidx.activity.compose,
9394
libs.androidx.startup,

‎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 {

0 commit comments

Comments
 (0)