컴포즈 모듈 빌드 오류 해결 및 README.md 업데이트 (#198)

* docs: 2.2.3.txt * chore: compose 모듈 빌드 추가 * chore: jitpack 배포 관련 코드 수정 * chore * fix: color 리소스 임시 추가 * del: jitpack.yml install 제거 * chore: 버전 업데이트(2.2.3->2.2.4) * chore: jitpack.yml 복구 * docs: README.md 수정
yourssu · Aug 22, 2023 · 67afd80 · 67afd80
1 parent eda6b62
commit 67afd80
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 24 deletions.
diff --git a/DesignSystem/build.gradle b/DesignSystem/build.gradle
@@ -46,11 +46,8 @@ android {
 afterEvaluate {
     publishing {
         publications {
-            yds(MavenPublication) {
+            release(MavenPublication) {
                 from components.release
-                groupId project.name
-                artifactId project.name
-                version versionProperties['versionName']
             }
         }
     }

diff --git a/README.md b/README.md
@@ -15,17 +15,24 @@ YDS 문서는 노션 페이지에서 관리됩니다.
 
 ## 🛠 설치 방법
 #### gradle Project
-```groovy
+```kts
 allprojects {
     repositories {
         '...'
-        maven { url 'https://jitpack.io' }
+        maven { url = uri("https://jitpack.io") }
     }
 }
 ```
 #### gradle app
-```groovy
-implementation "com.github.yourssu:YDS-Android:${YDSVersion}"
+```kts
+// YDS for both XML and Compose
+implementation("com.github.yourssu:YDS-Android:${YDSVersion}")
+
+// YDS for XML view
+implementation("com.github.yourssu.YDS-Android:DesignSystem:${YDSVersion}")
+
+// YDS for Jetpack Compose
+implementation("com.github.yourssu.YDS-Android:compose:${YDSVersion}")
 ```
 #### theme
 - 라이트 테마

diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -1,18 +1,9 @@
-import java.util.Properties
-
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
     `maven-publish`
 }
 
-val versionProperties = Properties().apply {
-    File(
-        rootProject.rootDir,
-        "version.properties"
-    ).inputStream().use { load(it) }
-}
-
 android {
     namespace = "com.yourssu.design.system.compose"
     compileSdk = 33
@@ -51,11 +42,8 @@ android {
 afterEvaluate {
     publishing {
         publications {
-            create<MavenPublication>("YDS-Compose") {
+            create<MavenPublication>("release") {
                 from(components["release"])
-                groupId = project.name
-                artifactId = project.name
-                version = versionProperties["versionName"].toString()
             }
         }
     }

diff --git a/compose/src/main/res/values-night/foundation_semantic_colors.xml b/compose/src/main/res/values-night/foundation_semantic_colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="buttonNormal">#BEBFC0</color>
+</resources>
diff --git a/compose/src/main/res/values/foundation_semantic_colors.xml b/compose/src/main/res/values/foundation_semantic_colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="buttonNormal">#505458</color>
+</resources>
diff --git a/jitpack.yml b/jitpack.yml
@@ -2,4 +2,5 @@ jdk:
   - openjdk11
 install:
   - ./gradlew :DesignSystem:build :DesignSystem:publishToMavenLocal -x :DesignSystem:test
-  - find . -name "*.aar"
+  - ./gradlew :compose:build :compose:publishToMavenLocal -x :compose:test
+  - find . -name "*.aar"
diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,5 @@
 include ':DesignSystem'
+include ':compose'
 include ':app:storybook'
 include ':app:yds-ui-tester'
 rootProject.name = "YDS-Android"
-include ':compose'
diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
-versionName=2.2.3
+versionName=2.2.4
 #자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다