Skip to content

Commit ff3c4d6

Browse files
committed
Revert "chore: update dependencies"
This reverts commit 3102353.
1 parent 8de0d4a commit ff3c4d6

File tree

164 files changed

+863
-1353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+863
-1353
lines changed

apps/codeApp/build.gradle.kts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,26 +93,19 @@ android {
9393
}
9494
}
9595

96+
kotlinOptions {
97+
jvmTarget = JvmTarget.fromTarget(Versions.java).target
98+
freeCompilerArgs += listOf(
99+
"-opt-in=kotlin.RequiresOptIn"
100+
)
101+
}
96102
packaging {
97103
resources.excludes.add("**/*.proto")
98104
resources.excludes.add("META-INF/LICENSE.md")
99105
resources.excludes.add("META-INF/LICENSE-notice.md")
100106
}
101107
}
102108

103-
kotlin {
104-
jvmToolchain(Versions.java.toInt())
105-
compilerOptions {
106-
optIn.addAll(
107-
listOf(
108-
"kotlin.RequiresOptIn",
109-
"kotlin.ExperimentalUnsignedTypes",
110-
"kotlin.time.ExperimentalTime"
111-
)
112-
)
113-
}
114-
}
115-
116109
dependencies {
117110
// libs (not included with services)
118111
implementation(project(":libs:locale:public"))

apps/codeApp/src/main/java/com/getcode/notifications/CodePushMessagingService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import dagger.hilt.android.AndroidEntryPoint
3939
import kotlinx.coroutines.CoroutineScope
4040
import kotlinx.coroutines.Dispatchers
4141
import kotlinx.coroutines.launch
42-
import kotlin.time.Clock
42+
import kotlinx.datetime.Clock
4343
import timber.log.Timber
4444
import javax.inject.Inject
4545

apps/codeApp/src/main/java/com/getcode/ui/tips/definitions/DownloadCodeTip.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import dev.bmcreations.tipkit.engines.Trigger
1414
import kotlinx.coroutines.CoroutineScope
1515
import kotlinx.coroutines.Dispatchers
1616
import kotlinx.coroutines.flow.firstOrNull
17-
import kotlin.time.Clock
18-
import kotlin.time.Instant
17+
import kotlinx.datetime.Clock
18+
import kotlinx.datetime.Instant
1919
import javax.inject.Inject
2020
import javax.inject.Singleton
2121
import kotlin.time.Duration.Companion.days

apps/codeApp/src/main/java/com/getcode/util/AccountUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import kotlinx.coroutines.CoroutineScope
1818
import kotlinx.coroutines.Dispatchers
1919
import kotlinx.coroutines.launch
2020
import kotlinx.coroutines.suspendCancellableCoroutine
21-
import kotlin.time.Clock
21+
import kotlinx.datetime.Clock
2222
import kotlin.coroutines.resume
2323

2424

apps/flipcash/app/build.gradle.kts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,26 +102,19 @@ android {
102102
}
103103
}
104104

105+
kotlinOptions {
106+
jvmTarget = JvmTarget.fromTarget(Versions.java).target
107+
freeCompilerArgs += listOf(
108+
"-opt-in=kotlin.RequiresOptIn"
109+
)
110+
}
105111
packaging {
106112
resources.excludes.add("**/*.proto")
107113
resources.excludes.add("META-INF/LICENSE.md")
108114
resources.excludes.add("META-INF/LICENSE-notice.md")
109115
}
110116
}
111117

112-
kotlin {
113-
jvmToolchain(Versions.java.toInt())
114-
compilerOptions {
115-
optIn.addAll(
116-
listOf(
117-
"kotlin.RequiresOptIn",
118-
"kotlin.ExperimentalUnsignedTypes",
119-
"kotlin.time.ExperimentalTime"
120-
)
121-
)
122-
}
123-
}
124-
125118
versioning {
126119
excludeBuildTypes = "debug"
127120
keepOriginalBundleFile = true

apps/flipcash/app/proguard-rules.pro

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,3 @@
4545
# kept. Suspend functions are wrapped in continuations where the type argument
4646
# is used.
4747
-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
48-
49-
-dontwarn io.grpc.internal.AbstractManagedChannelImplBuilder
50-
-dontwarn kotlinx.datetime.Clock$System
51-
-dontwarn kotlinx.datetime.Instant

apps/flipcash/core/build.gradle.kts

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ android {
1717
testInstrumentationRunner = Android.testInstrumentationRunner
1818
}
1919

20+
kotlinOptions {
21+
jvmTarget = JvmTarget.fromTarget(Versions.java).target
22+
freeCompilerArgs += listOf(
23+
"-opt-in=kotlin.ExperimentalUnsignedTypes",
24+
"-opt-in=kotlin.RequiresOptIn"
25+
)
26+
}
27+
2028
java {
2129
toolchain {
2230
languageVersion.set(JavaLanguageVersion.of(Versions.java))
@@ -29,19 +37,6 @@ android {
2937
}
3038
}
3139

32-
kotlin {
33-
jvmToolchain(Versions.java.toInt())
34-
compilerOptions {
35-
optIn.addAll(
36-
listOf(
37-
"kotlin.RequiresOptIn",
38-
"kotlin.ExperimentalUnsignedTypes",
39-
"kotlin.time.ExperimentalTime"
40-
)
41-
)
42-
}
43-
}
44-
4540
dependencies {
4641
implementation(Libs.inject)
4742
implementation(Libs.hilt)

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/feed/ActivityFeedMessage.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.flipcash.app.core.feed
33
import com.getcode.opencode.model.core.ID
44
import com.getcode.opencode.model.financial.LocalFiat
55
import com.getcode.solana.keys.PublicKey
6-
import kotlin.time.Instant
6+
import kotlinx.datetime.Instant
77
import kotlinx.serialization.Serializable
88
import kotlinx.serialization.json.Json
99

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/pools/Pool.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.getcode.opencode.model.financial.Fiat
66
import com.getcode.opencode.model.financial.div
77
import com.getcode.opencode.model.financial.times
88
import com.getcode.solana.keys.PublicKey
9-
import kotlin.time.Instant
9+
import kotlinx.datetime.Instant
1010

1111
data class Pool(
1212
val id: ID,

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/pools/PoolBet.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.flipcash.app.core.pools
22

33
import com.getcode.opencode.model.core.ID
44
import com.getcode.solana.keys.PublicKey
5-
import kotlin.time.Instant
5+
import kotlinx.datetime.Instant
66

77
data class PoolBet(
88
val id: ID,

0 commit comments

Comments
 (0)