Removing core-datetime module. (#76)

AdamMc331 · Mar 25, 2022 · 1db08ac · 1db08ac
1 parent c590a75
commit 1db08ac
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 76 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,3 @@ local.properties
 /core-ui/build/
 /eventoverview/build/
 PocketLeagueiOS/PocketLeagueiOS.xcodeproj/project.xcworkspace/xcuserdata/amcneilly.xcuserdatad/UserInterfaceState.xcuserstate
-/core-datetime/build/
diff --git a/core-datetime/build.gradle.kts b/core-datetime/build.gradle.kts
diff --git a/core-datetime/src/androidMain/AndroidManifest.xml b/core-datetime/src/androidMain/AndroidManifest.xml
diff --git a/eventsummary/build.gradle.kts b/eventsummary/build.gradle.kts
@@ -19,7 +19,6 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(project(":core-datetime"))
                 api(project(":core-ui"))
                 api(project(":event-implementation"))
                 implementation("com.tunjid.mutator:core:${Versions.mutator}")

diff --git a/...monMain/kotlin/com/adammcneilly/pocketleague/eventsummary/EventSummaryListStateMutator.kt b/...monMain/kotlin/com/adammcneilly/pocketleague/eventsummary/EventSummaryListStateMutator.kt
@@ -2,10 +2,10 @@
 
 package com.adammcneilly.pocketleague.eventsummary
 
-import com.adammcneilly.pocketleague.core.datetime.DateTimeFormatter
 import com.adammcneilly.pocketleague.core.ui.UIImage
 import com.adammcneilly.pocketleague.core.ui.UIText
 import com.adammcneilly.pocketleague.event.api.GetEventSummariesUseCase
+import com.adammcneilly.pocketleague.shared.core.datetime.DateTimeFormatter
 import com.adammcneilly.pocketleague.shared.core.models.EventSummary
 import com.tunjid.mutator.Mutation
 import com.tunjid.mutator.coroutines.stateFlowMutator

diff --git a/settings.gradle b/settings.gradle
@@ -5,6 +5,5 @@ include ':event-implementation'
 include ':eventsummary'
 include ':core-ui'
 include ':eventoverview'
-include ':core-datetime'
 include ':android-design-system'
 include ':shared'
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -19,7 +19,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(project(":core-datetime"))
+                api("org.jetbrains.kotlinx:kotlinx-datetime:${Versions.kotlinxDatetime}")
             }
         }
         val commonTest by getting {
@@ -57,4 +57,10 @@ android {
         minSdk = AndroidConfig.minSDK
         targetSdk = AndroidConfig.targetSDK
     }
+
+    compileOptions {
+        sourceCompatibility(JavaVersion.VERSION_1_8)
+        targetCompatibility(JavaVersion.VERSION_1_8)
+        isCoreLibraryDesugaringEnabled = true
+    }
 }
diff --git a/...league/core/datetime/DateTimeFormatter.kt → ...shared/core/datetime/DateTimeFormatter.kt b/...league/core/datetime/DateTimeFormatter.kt → ...shared/core/datetime/DateTimeFormatter.kt
@@ -1,4 +1,4 @@
-package com.adammcneilly.pocketleague.core.datetime
+package com.adammcneilly.pocketleague.shared.core.datetime
 
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.toJavaLocalDateTime

diff --git a/...league/core/datetime/DateTimeFormatter.kt → ...shared/core/datetime/DateTimeFormatter.kt b/...league/core/datetime/DateTimeFormatter.kt → ...shared/core/datetime/DateTimeFormatter.kt
@@ -1,4 +1,4 @@
-package com.adammcneilly.pocketleague.core.datetime
+package com.adammcneilly.pocketleague.shared.core.datetime
 
 import kotlinx.datetime.LocalDateTime
 

diff --git a/...league/core/datetime/DateTimeFormatter.kt → ...shared/core/datetime/DateTimeFormatter.kt b/...league/core/datetime/DateTimeFormatter.kt → ...shared/core/datetime/DateTimeFormatter.kt
@@ -1,4 +1,4 @@
-package com.adammcneilly.pocketleague.core.datetime
+package com.adammcneilly.pocketleague.shared.core.datetime
 
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.toNSDateComponents