🔀 :: (#481) 라이브러리 버전 업데이트

team-aliens · Oct 5, 2023 · 387e3fe · 387e3fe
2 parents f0342c1 + f169f3a
commit 387e3fe
Show file tree

Hide file tree

Showing 52 changed files with 78 additions and 83 deletions.
diff --git a/buildSrc/src/main/kotlin/ProjectProperties.kt b/buildSrc/src/main/kotlin/ProjectProperties.kt
@@ -4,7 +4,7 @@ object ProjectProperties {
  const val VersionCode = 111_16
  const val VersionName = "v1.1.1 alpha-6"
 
- const val CompileSdkVersion = 33
+ const val CompileSdkVersion = 34
  const val MinSdkVersion = 23
  const val TargetSdkVersion = 33
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -3,30 +3,30 @@ import org.gradle.api.JavaVersion
 object Versions {
 
  object Android {
- const val Core = "1.10.0"
- const val Activity = "1.7.1"
- const val Fragment = "1.5.7"
+ const val Core = "1.12.0"
+ const val Activity = "1.7.2"
+ const val Fragment = "1.6.1"
  const val AppCompat = "1.6.1"
  const val WorkRuntime = "2.8.1"
- const val LifeCycleRunTime = "2.6.1"
+ const val LifeCycleRunTime = "2.6.2"
  }
 
  object Kotlin {
  const val Kotlin = "1.8.10"
  }
 
  object Java {
- val Java = JavaVersion.VERSION_11
+ val Java = JavaVersion.VERSION_1_8
  }
 
  object Gradle {
- const val Android = "7.4.2"
- const val Kotlin = "1.8.10"
+ const val Android = "8.1.2"
+ const val Kotlin = "1.9.10"
  const val Firebase = "4.3.15"
  }
 
  object Ui {
- const val Compose = "1.4.2"
+ const val Compose = "1.5.3"
  const val ComposeGlide = "2.1.11"
  const val ComposeHiltNavigation = "1.0.0"
  const val Navigation = "2.6.0-alpha06"
@@ -38,7 +38,7 @@ object Versions {
  }
 
  object Di {
- const val Hilt = "2.44"
+ const val Hilt = "2.48"
  const val JavaInject = "1"
  }
 

diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 }
 
 android {
+ namespace = "team.aliens.dms_android.data"
  compileSdk = ProjectProperties.CompileSdkVersion
 
  defaultConfig {

diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.data">
-
-</manifest>
+<manifest package="team.aliens.dms_android.data" />
diff --git a/design-system/src/main/AndroidManifest.xml b/design-system/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.design_system">
+ package="team.aliens.design_system">
 
- <uses-permission android:name="android.permission.INTERNET"/>
-
-</manifest>
+ <uses-permission android:name="android.permission.INTERNET" />
+</manifest>
diff --git a/di/build.gradle.kts b/di/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
- namespace = "team.aliens.di"
+ namespace = "team.aliens.dms_android.di"
  compileSdk = ProjectProperties.CompileSdkVersion
 
  defaultConfig {
@@ -33,6 +33,9 @@ android {
  kotlinOptions {
  jvmTarget = Versions.Java.Java.toString()
  }
+ buildFeatures {
+ buildConfig = true
+ }
 }
 
 dependencies {

diff --git a/di/src/main/AndroidManifest.xml b/di/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
+<manifest package="team.aliens.dms_android.di" />
diff --git a/di/src/main/java/team/aliens/di/remote/HttpModule.kt b/di/src/main/java/team/aliens/di/remote/HttpModule.kt
@@ -1,5 +1,6 @@
 package team.aliens.di.remote
 
+import team.aliens.dms_android.remote.BuildConfig as RemoteBuildConfig
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -8,7 +9,7 @@ import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import team.aliens.data.facade.AuthorizationFacade
-import team.aliens.di.BuildConfig
+import team.aliens.dms_android.di.BuildConfig
 import team.aliens.remote.annotation.BaseUrl
 import team.aliens.remote.annotation.GlobalOkHttpClient
 import team.aliens.remote.annotation.TokenReissueOkHttpClient
@@ -19,7 +20,6 @@ import team.aliens.remote.http.TokenReissueManagerImpl
 import team.aliens.remote.util.OkHttpClient
 import team.aliens.remote.util.Retrofit
 import javax.inject.Singleton
-import team.aliens.remote.BuildConfig as RemoteBuildConfig
 
 @Module
 @InstallIn(SingletonComponent::class)

diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 android {
 
- namespace = "team.aliens.domain"
+ namespace = "team.aliens.dms_android.domain"
  compileSdk = ProjectProperties.CompileSdkVersion
 
  defaultConfig {
@@ -31,6 +31,9 @@ android {
  kotlinOptions {
  jvmTarget =Versions.Java.Java.toString()
  }
+ kotlin{
+
+ }
 }
 
 dependencies {
@@ -41,6 +44,4 @@ dependencies {
  implementation(Dependencies.Di.Hilt)
  implementation(Dependencies.Di.JavaInject)
  kapt(Dependencies.Di.HiltCompiler)
-
- //implementation(Dependencies.Kotlin.Coroutines)
-}
+}
diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.domain">
-
-</manifest>
+<manifest package="team.aliens.dms_android.domain" />
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 11 19:22:54 KST 2022
+#Thu Oct 05 10:04:45 KST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/local/build.gradle.kts b/local/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
- namespace = "team.aliens.local"
+ namespace = "team.aliens.dms_android.local"
  compileSdk = ProjectProperties.CompileSdkVersion
 
  defaultConfig {

diff --git a/local/src/main/AndroidManifest.xml b/local/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
+<manifest package="team.aliens.dms_android.local" />
diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 android {
 
- namespace = "team.aliens.presentation"
+ namespace = "team.aliens.dms_android.presentation"
  compileSdk = ProjectProperties.CompileSdkVersion
 
  defaultConfig {

diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
- package="com.example.dms_android">
+ package="team.aliens.dms_android.presentation">
 
  <uses-feature
  android:name="android.hardware.camera"
@@ -45,6 +45,7 @@
  <provider
  android:name="androidx.startup.InitializationProvider"
  android:authorities="${applicationId}.androidx-startup"
+ android:exported="false"
  tools:node="remove" />
 
  <service

diff --git a/presentation/src/main/java/team/aliens/dms_android/base/BaseViewModel2.kt b/presentation/src/main/java/team/aliens/dms_android/base/BaseViewModel2.kt
@@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import team.aliens.dms_android.util.MutableEventFlow
 import team.aliens.dms_android.util.asEventFlow
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 import javax.inject.Inject
 
 @Deprecated("legacy")

diff --git a/presentation/src/main/java/team/aliens/dms_android/component/AppLogo.kt b/presentation/src/main/java/team/aliens/dms_android/component/AppLogo.kt
@@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 @Composable
 fun AppLogo(

diff --git a/presentation/src/main/java/team/aliens/dms_android/config/NotificationConfig.kt b/presentation/src/main/java/team/aliens/dms_android/config/NotificationConfig.kt
@@ -7,7 +7,7 @@ import android.app.NotificationManager
 import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 // todo 내부 함수 분리 필요
 @RequiresApi(Build.VERSION_CODES.O)

diff --git a/presentation/src/main/java/team/aliens/dms_android/feature/auth/findid/FindIdScreen.kt b/presentation/src/main/java/team/aliens/dms_android/feature/auth/findid/FindIdScreen.kt
@@ -51,7 +51,7 @@ import team.aliens.design_system.toast.rememberToast
 import team.aliens.design_system.typography.Body2
 import team.aliens.dms_android.component.AppLogo
 import team.aliens.domain.model.school.FetchSchoolsOutput
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 @Composable
 fun FindIdScreen(
@@ -190,7 +190,7 @@ fun FindIdScreen(
  color = DormTheme.colors.primaryVariant,
  )
  Icon(
- painterResource(id = R.drawable.ic_down),
+ painterResource(id = team.aliens.design_system.R.drawable.ic_down),
  contentDescription = null,
  )
  }

diff --git a/...a/team/aliens/dms_android/feature/auth/resetpassword/ResetPasswordIdVerificationScreen.kt b/...a/team/aliens/dms_android/feature/auth/resetpassword/ResetPasswordIdVerificationScreen.kt
@@ -38,7 +38,7 @@ import team.aliens.design_system.toast.rememberToast
 import team.aliens.design_system.typography.Body2
 import team.aliens.dms_android.component.AppLogo
 import team.aliens.domain.model._common.EmailVerificationType
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 @Composable
 fun ResetPasswordIdVerificationScreen(

diff --git a/...java/team/aliens/dms_android/feature/auth/resetpassword/ResetPasswordSetPasswordScreen.kt b/...java/team/aliens/dms_android/feature/auth/resetpassword/ResetPasswordSetPasswordScreen.kt
@@ -44,7 +44,7 @@ import team.aliens.design_system.typography.Body4
 import team.aliens.design_system.typography.Caption
 import team.aliens.dms_android.component.AppLogo
 import team.aliens.dms_android.util.TopBar
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 @Suppress("ConstPropertyName")
 private const val passwordFormat = "^(?=.*[A-Za-z])(?=.*[0-9])(?=.*[!@#$%^&*()_+=-]).{8,20}"
@@ -119,7 +119,7 @@ fun ResetPasswordSetPasswordScreen(
  .padding(top = 32.dp, bottom = 7.dp)
  .height(85.dp)
  .width(85.dp),
- painter = painterResource(R.drawable.ic_information),
+ painter = painterResource(team.aliens.design_system.R.drawable.ic_information),
  contentDescription = stringResource(id = R.string.MainLogo),
  )
 

diff --git a/...in/java/team/aliens/dms_android/feature/auth/resetpassword/SuccessChangePasswordScreen.kt b/...in/java/team/aliens/dms_android/feature/auth/resetpassword/SuccessChangePasswordScreen.kt
@@ -19,7 +19,7 @@ import team.aliens.design_system.extension.Space
 import team.aliens.design_system.theme.DormTheme
 import team.aliens.design_system.typography.Body2
 import team.aliens.dms_android.util.TopBar
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 @Composable
 fun SuccessChangePasswordScreen(

diff --git a/presentation/src/main/java/team/aliens/dms_android/feature/auth/signin/SignInScreen.kt b/presentation/src/main/java/team/aliens/dms_android/feature/auth/signin/SignInScreen.kt
@@ -35,8 +35,7 @@ import team.aliens.design_system.typography.Caption
 import team.aliens.dms_android.common.LocalAvailableFeatures
 import team.aliens.dms_android.component.AppLogo
 import team.aliens.dms_android.extension.collectInLaunchedEffectWithLifeCycle
-import team.aliens.dms_android.util.getDeviceUid
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 @Composable
 internal fun SignInScreen(

diff --git a/.../src/main/java/team/aliens/dms_android/feature/main/editpassword/ConfirmPasswordScreen.kt b/.../src/main/java/team/aliens/dms_android/feature/main/editpassword/ConfirmPasswordScreen.kt
@@ -31,7 +31,7 @@ import team.aliens.design_system.typography.Body2
 import team.aliens.dms_android.component.AppLogo
 import team.aliens.dms_android.feature.auth.resetpassword.ChangePasswordViewModel
 import team.aliens.dms_android.util.TopBar
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 @Composable
 fun ConfirmPasswordScreen(

diff --git a/...ation/src/main/java/team/aliens/dms_android/feature/main/home/HomeBottomNavigationItem.kt b/...ation/src/main/java/team/aliens/dms_android/feature/main/home/HomeBottomNavigationItem.kt
@@ -2,7 +2,7 @@ package team.aliens.dms_android.feature.main.home
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 internal sealed class HomeBottomNavigationItem(
  val route: String,

diff --git a/.../main/java/team/aliens/dms_android/feature/main/home/announcements/AnnouncementsScreen.kt b/.../main/java/team/aliens/dms_android/feature/main/home/announcements/AnnouncementsScreen.kt
@@ -39,7 +39,7 @@ import team.aliens.design_system.typography.Body4
 import team.aliens.design_system.typography.OverLine
 import team.aliens.domain.model._common.Order
 import team.aliens.domain.model.notice.Notice
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 private val Order.text: String
  @Composable inline get() = when (this) {

diff --git a/.../main/java/team/aliens/dms_android/feature/main/home/announcements/NoticeDetailsScreen.kt b/.../main/java/team/aliens/dms_android/feature/main/home/announcements/NoticeDetailsScreen.kt
@@ -25,7 +25,7 @@ import team.aliens.design_system.typography.Body5
 import team.aliens.design_system.typography.Caption
 import team.aliens.design_system.typography.Title3
 import team.aliens.dms_android.util.TopBar
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 @Composable
 internal fun NoticeDetailsScreen(

diff --git a/.../src/main/java/team/aliens/dms_android/feature/main/home/application/ApplicationScreen.kt b/.../src/main/java/team/aliens/dms_android/feature/main/home/application/ApplicationScreen.kt
@@ -37,7 +37,7 @@ import team.aliens.design_system.typography.Body1
 import team.aliens.design_system.typography.Body5
 import team.aliens.design_system.typography.SubTitle2
 import team.aliens.dms_android.component.listFadeBrush
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 private sealed class ApplicationCardItem(
  @StringRes val titleRes: Int,

diff --git a/presentation/src/main/java/team/aliens/dms_android/feature/main/home/home/HomeScreen.kt b/presentation/src/main/java/team/aliens/dms_android/feature/main/home/home/HomeScreen.kt
@@ -75,7 +75,7 @@ import team.aliens.dms_android.component.listFadeBrush
 import team.aliens.dms_android.feature.main.home.home.MealCardType.BREAKFAST
 import team.aliens.dms_android.feature.main.home.home.MealCardType.DINNER
 import team.aliens.dms_android.feature.main.home.home.MealCardType.LUNCH
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 import kotlin.math.absoluteValue
 
 @Stable

diff --git a/...ion/src/main/java/team/aliens/dms_android/feature/main/home/mypage/CheckOriginPwScreen.kt b/...ion/src/main/java/team/aliens/dms_android/feature/main/home/mypage/CheckOriginPwScreen.kt
@@ -17,7 +17,7 @@ import team.aliens.design_system.theme.DormTheme
 import team.aliens.design_system.typography.Body4
 import team.aliens.dms_android.component.AppLogo
 import team.aliens.dms_android.util.TopBar
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 @Deprecated("no usage")
 @Composable

diff --git a/.../main/java/team/aliens/dms_android/feature/main/home/mypage/MyPageChangePasswordScreen.kt b/.../main/java/team/aliens/dms_android/feature/main/home/mypage/MyPageChangePasswordScreen.kt
@@ -31,7 +31,7 @@ import team.aliens.dms_android.component.AppLogo
 import team.aliens.dms_android.feature.auth.resetpassword.ChangePasswordViewModel
 import team.aliens.dms_android.feature.DmsRoute
 import team.aliens.dms_android.util.TopBar
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 @Stable
 const val passwordFormat = "^(?=.*[A-Za-z])(?=.*[0-9])(?=.*[!@#$%^&*()_+=-]).{8,20}"

diff --git a/presentation/src/main/java/team/aliens/dms_android/feature/main/home/mypage/MyPageScreen.kt b/presentation/src/main/java/team/aliens/dms_android/feature/main/home/mypage/MyPageScreen.kt
@@ -47,7 +47,7 @@ import team.aliens.design_system.typography.Headline3
 import team.aliens.design_system.typography.Title1
 import team.aliens.dms_android.feature.main.image.SelectImageTypeDialog
 import team.aliens.domain.model._common.Sex
-import team.aliens.presentation.R
+import team.aliens.dms_android.presentation.R
 
 @Composable
 internal fun MyPageScreen(