Skip to content

Commit e143325

Browse files
committed
Merge remote-tracking branch 'origin/feat/compile-scanning-libs' into code/cash
* origin/feat/compile-scanning-libs: chore(ocp): handle grab for all current payload kinds chore: disable NDK uploads for now Reapply "feat: update libsodium for 16kb alignment" chore: update NDK to 29 chore: bump minSDK to 29 (Android 10+) Revert "feat: update libsodium for 16kb alignment" chore: update dependencies chore: update bugsnag dependencies chore: include library archives provided by opencv feat: update libsodium for 16kb alignment feat: update kikcodes and scanner to be compiled and update to support 16kb page size requirement
2 parents e0f650a + 8cdedb2 commit e143325

File tree

1,213 files changed

+777462
-1742
lines changed

Some content is hidden

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

1,213 files changed

+777462
-1742
lines changed

apps/codeApp/build.gradle.kts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,6 @@ android {
8787
isCoreLibraryDesugaringEnabled = true
8888
}
8989

90-
java {
91-
toolchain {
92-
languageVersion.set(JavaLanguageVersion.of(Versions.java))
93-
}
94-
}
95-
96-
kotlinOptions {
97-
jvmTarget = JvmTarget.fromTarget(Versions.java).target
98-
freeCompilerArgs += listOf(
99-
"-opt-in=kotlin.RequiresOptIn"
100-
)
101-
}
10290
packaging {
10391
resources.excludes.add("**/*.proto")
10492
resources.excludes.add("META-INF/LICENSE.md")

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 kotlinx.datetime.Clock
42+
import kotlin.time.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import dev.bmcreations.tipkit.engines.Trigger
1414
import kotlinx.coroutines.CoroutineScope
1515
import kotlinx.coroutines.Dispatchers
1616
import kotlinx.coroutines.flow.firstOrNull
17-
import kotlinx.datetime.Clock
17+
import kotlin.time.Clock
1818
import kotlinx.datetime.Instant
1919
import javax.inject.Inject
2020
import javax.inject.Singleton

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 kotlinx.datetime.Clock
21+
import kotlin.time.Clock
2222
import kotlin.coroutines.resume
2323

2424

apps/flipcash/app/build.gradle.kts

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,6 @@ android {
9696
isCoreLibraryDesugaringEnabled = true
9797
}
9898

99-
java {
100-
toolchain {
101-
languageVersion.set(JavaLanguageVersion.of(Versions.java))
102-
}
103-
}
104-
105-
kotlinOptions {
106-
jvmTarget = JvmTarget.fromTarget(Versions.java).target
107-
freeCompilerArgs += listOf(
108-
"-opt-in=kotlin.RequiresOptIn"
109-
)
110-
}
11199
packaging {
112100
resources.excludes.add("**/*.proto")
113101
resources.excludes.add("META-INF/LICENSE.md")
@@ -123,7 +111,6 @@ versioning {
123111
bugsnag {
124112
variants {
125113
release {
126-
autoUploadBundle = true
127114
autoCreateBuild = true
128115
}
129116
debug {
@@ -132,6 +119,21 @@ bugsnag {
132119
}
133120
}
134121

122+
kotlin {
123+
jvmToolchain {
124+
languageVersion.set(JavaLanguageVersion.of(Versions.java))
125+
}
126+
127+
compilerOptions {
128+
jvmTarget.set(JvmTarget.fromTarget(Versions.java))
129+
optIn.addAll(
130+
"kotlin.time.ExperimentalTime",
131+
"kotlin.ExperimentalUnsignedTypes",
132+
"kotlin.RequiresOptIn"
133+
)
134+
}
135+
}
136+
135137
dependencies {
136138
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
137139
implementation(project(":services:flipcash-compose"))

apps/flipcash/core/build.gradle.kts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,24 @@ 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-
)
20+
buildFeatures {
21+
buildConfig = true
22+
compose = true
2623
}
24+
}
2725

28-
java {
29-
toolchain {
30-
languageVersion.set(JavaLanguageVersion.of(Versions.java))
31-
}
26+
kotlin {
27+
jvmToolchain {
28+
languageVersion.set(JavaLanguageVersion.of(Versions.java))
3229
}
3330

34-
buildFeatures {
35-
buildConfig = true
36-
compose = true
31+
compilerOptions {
32+
jvmTarget.set(JvmTarget.fromTarget(Versions.java))
33+
optIn.addAll(
34+
"kotlin.time.ExperimentalTime",
35+
"kotlin.ExperimentalUnsignedTypes",
36+
"kotlin.RequiresOptIn"
37+
)
3738
}
3839
}
3940

apps/flipcash/features/advanced/build.gradle.kts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,24 @@ 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-
)
20+
buildFeatures {
21+
buildConfig = true
22+
compose = true
2623
}
24+
}
2725

28-
java {
29-
toolchain {
30-
languageVersion.set(JavaLanguageVersion.of(Versions.java))
31-
}
26+
kotlin {
27+
jvmToolchain {
28+
languageVersion.set(JavaLanguageVersion.of(Versions.java))
3229
}
3330

34-
buildFeatures {
35-
buildConfig = true
36-
compose = true
31+
compilerOptions {
32+
jvmTarget.set(JvmTarget.fromTarget(Versions.java))
33+
optIn.addAll(
34+
"kotlin.time.ExperimentalTime",
35+
"kotlin.ExperimentalUnsignedTypes",
36+
"kotlin.RequiresOptIn"
37+
)
3738
}
3839
}
3940

apps/flipcash/features/appsettings/build.gradle.kts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,24 @@ 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-
)
20+
buildFeatures {
21+
buildConfig = true
22+
compose = true
2623
}
24+
}
2725

28-
java {
29-
toolchain {
30-
languageVersion.set(JavaLanguageVersion.of(Versions.java))
31-
}
26+
kotlin {
27+
jvmToolchain {
28+
languageVersion.set(JavaLanguageVersion.of(Versions.java))
3229
}
3330

34-
buildFeatures {
35-
buildConfig = true
36-
compose = true
31+
compilerOptions {
32+
jvmTarget.set(JvmTarget.fromTarget(Versions.java))
33+
optIn.addAll(
34+
"kotlin.time.ExperimentalTime",
35+
"kotlin.ExperimentalUnsignedTypes",
36+
"kotlin.RequiresOptIn"
37+
)
3738
}
3839
}
3940

apps/flipcash/features/backupkey/build.gradle.kts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,24 @@ 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-
)
20+
buildFeatures {
21+
buildConfig = true
22+
compose = true
2623
}
24+
}
2725

28-
java {
29-
toolchain {
30-
languageVersion.set(JavaLanguageVersion.of(Versions.java))
31-
}
26+
kotlin {
27+
jvmToolchain {
28+
languageVersion.set(JavaLanguageVersion.of(Versions.java))
3229
}
3330

34-
buildFeatures {
35-
buildConfig = true
36-
compose = true
31+
compilerOptions {
32+
jvmTarget.set(JvmTarget.fromTarget(Versions.java))
33+
optIn.addAll(
34+
"kotlin.time.ExperimentalTime",
35+
"kotlin.ExperimentalUnsignedTypes",
36+
"kotlin.RequiresOptIn"
37+
)
3738
}
3839
}
3940

apps/flipcash/features/balance/build.gradle.kts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,24 @@ 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-
)
20+
buildFeatures {
21+
buildConfig = true
22+
compose = true
2623
}
24+
}
2725

28-
java {
29-
toolchain {
30-
languageVersion.set(JavaLanguageVersion.of(Versions.java))
31-
}
26+
kotlin {
27+
jvmToolchain {
28+
languageVersion.set(JavaLanguageVersion.of(Versions.java))
3229
}
3330

34-
buildFeatures {
35-
buildConfig = true
36-
compose = true
31+
compilerOptions {
32+
jvmTarget.set(JvmTarget.fromTarget(Versions.java))
33+
optIn.addAll(
34+
"kotlin.time.ExperimentalTime",
35+
"kotlin.ExperimentalUnsignedTypes",
36+
"kotlin.RequiresOptIn"
37+
)
3738
}
3839
}
3940

0 commit comments

Comments
 (0)