Skip to content

Commit 84ca719

Browse files
Merge pull request #9 from taetae98coding/develop
1.8.1
2 parents 4cfe19a + 0460e0c commit 84ca719

111 files changed

Lines changed: 2089 additions & 360 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.

Diary/Diary.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
"$(inherited)",
316316
"@executable_path/Frameworks",
317317
);
318-
MARKETING_VERSION = 1.8.0;
318+
MARKETING_VERSION = 1.8.1;
319319
OTHER_LDFLAGS = "";
320320
PRODUCT_BUNDLE_IDENTIFIER = io.github.taetae98coding.diary.dev;
321321
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -413,7 +413,7 @@
413413
"$(inherited)",
414414
"@executable_path/Frameworks",
415415
);
416-
MARKETING_VERSION = 1.8.0;
416+
MARKETING_VERSION = 1.8.1;
417417
OTHER_LDFLAGS = "";
418418
PRODUCT_BUNDLE_IDENTIFIER = io.github.taetae98coding.diary;
419419
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -518,7 +518,7 @@
518518
"$(inherited)",
519519
"@executable_path/Frameworks",
520520
);
521-
MARKETING_VERSION = 1.8.0;
521+
MARKETING_VERSION = 1.8.1;
522522
OTHER_LDFLAGS = "";
523523
PRODUCT_BUNDLE_IDENTIFIER = io.github.taetae98coding.diary;
524524
PRODUCT_NAME = "$(TARGET_NAME)";

Diary/Diary/DiaryApp.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import SwiftUI
22
import FirebaseCore
3+
import KMP
34

45
class AppDelegate: NSObject, UIApplicationDelegate {
56
func application(_ application: UIApplication,
67
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
78
FirebaseApp.configure()
9+
LoggerInitializerKt.setupLogger()
810

911
return true
1012
}

app/android/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,12 @@ dependencyGuard {
8484

8585
dependencies {
8686
implementation(projects.app.shared)
87+
implementation(projects.logger.core)
88+
implementation(projects.logger.analytics.impl)
89+
implementation(projects.logger.console.impl)
90+
implementation(projects.logger.crashlytics.impl)
8791
implementation(libs.androidx.activity.compose)
92+
implementation(libs.androidx.startup.runtime)
8893
implementation(platform(libs.firebase.bom))
8994
implementation(libs.firebase.analytics)
9095
implementation(libs.firebase.crashlytics)

app/android/dependencies/realReleaseRuntimeClasspath.txt

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ androidx.arch.core:core-common:2.2.0
1010
androidx.arch.core:core-runtime:2.2.0
1111
androidx.autofill:autofill:1.0.0
1212
androidx.biometric:biometric:1.1.0
13-
androidx.browser:browser:1.9.0
13+
androidx.browser:browser:1.10.0
1414
androidx.collection:collection-jvm:1.5.0
1515
androidx.collection:collection-ktx:1.5.0
1616
androidx.collection:collection:1.5.0
@@ -244,25 +244,25 @@ com.squareup.okhttp3:okhttp-android:5.3.2
244244
com.squareup.okhttp3:okhttp:5.3.2
245245
com.squareup.okio:okio-jvm:3.17.0
246246
com.squareup.okio:okio:3.17.0
247-
dev.whyoleg.cryptography:cryptography-bigint-jvm:0.5.0
248-
dev.whyoleg.cryptography:cryptography-bigint:0.5.0
249-
dev.whyoleg.cryptography:cryptography-bom:0.5.0
250-
dev.whyoleg.cryptography:cryptography-core-jvm:0.5.0
251-
dev.whyoleg.cryptography:cryptography-core:0.5.0
252-
dev.whyoleg.cryptography:cryptography-provider-base-jvm:0.5.0
253-
dev.whyoleg.cryptography:cryptography-provider-base:0.5.0
254-
dev.whyoleg.cryptography:cryptography-provider-jdk-jvm:0.5.0
255-
dev.whyoleg.cryptography:cryptography-provider-jdk:0.5.0
256-
dev.whyoleg.cryptography:cryptography-provider-optimal-jvm:0.5.0
257-
dev.whyoleg.cryptography:cryptography-provider-optimal:0.5.0
258-
dev.whyoleg.cryptography:cryptography-random-jvm:0.5.0
259-
dev.whyoleg.cryptography:cryptography-random:0.5.0
260-
dev.whyoleg.cryptography:cryptography-serialization-asn1-jvm:0.5.0
261-
dev.whyoleg.cryptography:cryptography-serialization-asn1-modules-jvm:0.5.0
262-
dev.whyoleg.cryptography:cryptography-serialization-asn1-modules:0.5.0
263-
dev.whyoleg.cryptography:cryptography-serialization-asn1:0.5.0
264-
dev.whyoleg.cryptography:cryptography-serialization-pem-jvm:0.5.0
265-
dev.whyoleg.cryptography:cryptography-serialization-pem:0.5.0
247+
dev.whyoleg.cryptography:cryptography-bigint-jvm:0.6.0
248+
dev.whyoleg.cryptography:cryptography-bigint:0.6.0
249+
dev.whyoleg.cryptography:cryptography-bom:0.6.0
250+
dev.whyoleg.cryptography:cryptography-core-jvm:0.6.0
251+
dev.whyoleg.cryptography:cryptography-core:0.6.0
252+
dev.whyoleg.cryptography:cryptography-provider-base-jvm:0.6.0
253+
dev.whyoleg.cryptography:cryptography-provider-base:0.6.0
254+
dev.whyoleg.cryptography:cryptography-provider-jdk-jvm:0.6.0
255+
dev.whyoleg.cryptography:cryptography-provider-jdk:0.6.0
256+
dev.whyoleg.cryptography:cryptography-provider-optimal-jvm:0.6.0
257+
dev.whyoleg.cryptography:cryptography-provider-optimal:0.6.0
258+
dev.whyoleg.cryptography:cryptography-random-jvm:0.6.0
259+
dev.whyoleg.cryptography:cryptography-random:0.6.0
260+
dev.whyoleg.cryptography:cryptography-serialization-asn1-jvm:0.6.0
261+
dev.whyoleg.cryptography:cryptography-serialization-asn1-modules-jvm:0.6.0
262+
dev.whyoleg.cryptography:cryptography-serialization-asn1-modules:0.6.0
263+
dev.whyoleg.cryptography:cryptography-serialization-asn1:0.6.0
264+
dev.whyoleg.cryptography:cryptography-serialization-pem-jvm:0.6.0
265+
dev.whyoleg.cryptography:cryptography-serialization-pem:0.6.0
266266
io.coil-kt.coil3:coil-android:3.4.0
267267
io.coil-kt.coil3:coil-compose-android:3.4.0
268268
io.coil-kt.coil3:coil-compose-core-android:3.4.0
@@ -275,12 +275,14 @@ io.coil-kt.coil3:coil-network-core:3.4.0
275275
io.coil-kt.coil3:coil-network-ktor3-android:3.4.0
276276
io.coil-kt.coil3:coil-network-ktor3:3.4.0
277277
io.coil-kt.coil3:coil:3.4.0
278-
io.github.jan-tennert.supabase:auth-kt-android:3.5.0
279-
io.github.jan-tennert.supabase:auth-kt:3.5.0
280-
io.github.jan-tennert.supabase:functions-kt-android:3.5.0
281-
io.github.jan-tennert.supabase:functions-kt:3.5.0
282-
io.github.jan-tennert.supabase:supabase-kt-android:3.5.0
283-
io.github.jan-tennert.supabase:supabase-kt:3.5.0
278+
io.github.aakira:napier-android:2.7.1
279+
io.github.aakira:napier:2.7.1
280+
io.github.jan-tennert.supabase:auth-kt-android:3.6.0
281+
io.github.jan-tennert.supabase:auth-kt:3.6.0
282+
io.github.jan-tennert.supabase:functions-kt-android:3.6.0
283+
io.github.jan-tennert.supabase:functions-kt:3.6.0
284+
io.github.jan-tennert.supabase:supabase-kt-android:3.6.0
285+
io.github.jan-tennert.supabase:supabase-kt:3.6.0
284286
io.insert-koin:koin-android:4.2.1
285287
io.insert-koin:koin-androidx-workmanager:4.2.1
286288
io.insert-koin:koin-annotations-jvm:4.2.1
@@ -368,18 +370,18 @@ org.jetbrains.kotlinx:atomicfu-jvm:0.28.0
368370
org.jetbrains.kotlinx:atomicfu:0.28.0
369371
org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
370372
org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
371-
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0-rc01
372-
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.11.0-rc01
373-
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.11.0-rc01
374-
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0-rc01
375-
org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.11.0-rc01
376-
org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.11.0-rc01
377-
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.8.0-rc01
378-
org.jetbrains.kotlinx:kotlinx-datetime:0.8.0-rc01
379-
org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.8.2
380-
org.jetbrains.kotlinx:kotlinx-io-bytestring:0.8.2
381-
org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.8.2
382-
org.jetbrains.kotlinx:kotlinx-io-core:0.8.2
373+
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0-rc02
374+
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.11.0-rc02
375+
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.11.0-rc02
376+
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0-rc02
377+
org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.11.0-rc02
378+
org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.11.0-rc02
379+
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.8.0-rc02
380+
org.jetbrains.kotlinx:kotlinx-datetime:0.8.0-rc02
381+
org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.9.0
382+
org.jetbrains.kotlinx:kotlinx-io-bytestring:0.9.0
383+
org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.9.0
384+
org.jetbrains.kotlinx:kotlinx-io-core:0.9.0
383385
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.11.0
384386
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.11.0
385387
org.jetbrains.kotlinx:kotlinx-serialization-core:1.11.0

app/android/src/main/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
android:name="androidx.work.WorkManagerInitializer"
3030
android:value="androidx.startup"
3131
tools:node="remove" />
32+
<meta-data
33+
android:name="io.github.taetae98coding.diary.initializer.LoggerInitializer"
34+
android:value="androidx.startup" />
3235
</provider>
3336
</application>
3437

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package io.github.taetae98coding.diary.initializer
2+
3+
import android.content.Context
4+
import androidx.startup.Initializer
5+
import io.github.taetae98coding.diary.logger.analytics.impl.AndroidAnalyticsLogger
6+
import io.github.taetae98coding.diary.logger.console.impl.ConsoleLogger
7+
import io.github.taetae98coding.diary.logger.core.DiaryLogger
8+
import io.github.taetae98coding.diary.logger.crashlytics.impl.AndroidCrashlyticsLogger
9+
10+
internal class LoggerInitializer : Initializer<Unit> {
11+
override fun create(context: Context) {
12+
DiaryLogger.addLogger(ConsoleLogger)
13+
DiaryLogger.addLogger(AndroidAnalyticsLogger)
14+
DiaryLogger.addLogger(AndroidCrashlyticsLogger)
15+
}
16+
17+
override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()
18+
}

app/ios/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ kotlin {
2222
commonMain {
2323
dependencies {
2424
implementation(projects.app.shared)
25+
implementation(projects.logger.core)
26+
implementation(projects.logger.analytics.impl)
27+
implementation(projects.logger.console.impl)
28+
implementation(projects.logger.crashlytics.impl)
2529
implementation(libs.jetbrains.compose.ui)
2630
}
2731
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package io.github.taetae98coding.diary.initializer
2+
3+
import io.github.taetae98coding.diary.logger.analytics.impl.AppleAnalyticsLogger
4+
import io.github.taetae98coding.diary.logger.console.impl.ConsoleLogger
5+
import io.github.taetae98coding.diary.logger.core.DiaryLogger
6+
import io.github.taetae98coding.diary.logger.crashlytics.impl.AppleCrashlyticsLogger
7+
8+
public fun setupLogger() {
9+
DiaryLogger.addLogger(ConsoleLogger)
10+
DiaryLogger.addLogger(AppleAnalyticsLogger)
11+
DiaryLogger.addLogger(AppleCrashlyticsLogger)
12+
}

app/jvm/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ kotlin {
1313
commonMain {
1414
dependencies {
1515
implementation(projects.app.shared)
16+
implementation(projects.logger.core)
17+
implementation(projects.logger.console.impl)
1618
implementation(libs.jetbrains.compose.ui)
1719
runtimeOnly(compose.desktop.currentOs)
1820
}

app/jvm/src/commonMain/kotlin/io/github/taetae98coding/diary/JvmApp.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import androidx.compose.ui.unit.dp
55
import androidx.compose.ui.window.WindowState
66
import androidx.compose.ui.window.singleWindowApplication
77
import io.github.taetae98coding.diary.app.shared.App
8+
import io.github.taetae98coding.diary.logger.console.impl.ConsoleLogger
9+
import io.github.taetae98coding.diary.logger.core.DiaryLogger
810
import java.awt.Dimension
911

1012
// iPhone 17 Pro Max 비율
@@ -15,6 +17,8 @@ private const val MIN_WIDTH = 360
1517
private const val MIN_HEIGHT = 784
1618

1719
public fun main() {
20+
DiaryLogger.addLogger(ConsoleLogger)
21+
1822
singleWindowApplication(
1923
state = WindowState(size = DpSize(WIDTH.dp, HEIGHT.dp)),
2024
title = BuildKonfig.APP_NAME,

0 commit comments

Comments
 (0)