[feature/fix-build-issues] AndroidEntryPoint 떼기 + Gradle 버전 업

sopt-makers · Sep 24, 2024 · f95ae33 · f95ae33
1 parent 95680a8
commit f95ae33
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/app/src/main/java/org/sopt/official/feature/notification/SchemeActivity.kt b/app/src/main/java/org/sopt/official/feature/notification/SchemeActivity.kt
@@ -30,22 +30,23 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.hilt.android.EntryPointAccessors
 import org.sopt.official.auth.model.UserStatus
 import org.sopt.official.common.navigator.DeepLinkType
 import org.sopt.official.common.util.extractQueryParameter
 import org.sopt.official.common.util.isExpiredDate
 import org.sopt.official.common.util.serializableExtra
 import org.sopt.official.feature.notification.detail.NotificationDetailActivity
-import org.sopt.official.network.persistence.SoptDataStore
+import org.sopt.official.network.persistence.SoptDataStoreEntryPoint
 import timber.log.Timber
 import java.io.Serializable
-import javax.inject.Inject
 
-@AndroidEntryPoint
 class SchemeActivity : AppCompatActivity() {
-    @Inject
-    lateinit var dataStore: SoptDataStore
+    private val dataStore by lazy {
+        EntryPointAccessors
+            .fromApplication<SoptDataStoreEntryPoint>(applicationContext)
+            .soptDataStore()
+    }
     private val args by serializableExtra(Argument("", ""))
 
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Jan 13 12:46:38 KST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/core/network/src/main/java/org/sopt/official/network/persistence/SoptDataStore.kt b/core/network/src/main/java/org/sopt/official/network/persistence/SoptDataStore.kt
@@ -26,11 +26,14 @@ package org.sopt.official.network.persistence
 
 import android.content.Context
 import androidx.core.content.edit
+import dagger.hilt.EntryPoint
+import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
-import javax.inject.Singleton
+import dagger.hilt.components.SingletonComponent
 import org.sopt.official.common.di.LocalStore
 import org.sopt.official.common.file.createSharedPreference
+import javax.inject.Inject
+import javax.inject.Singleton
 
 @Singleton
 class SoptDataStore @Inject constructor(
@@ -77,3 +80,9 @@ class SoptDataStore @Inject constructor(
         private const val UNAUTHENTICATED = "UNAUTHENTICATED"
     }
 }
+
+@EntryPoint
+@InstallIn(SingletonComponent::class)
+interface SoptDataStoreEntryPoint {
+    fun soptDataStore(): SoptDataStore
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME