Skip to content

Commit

Permalink
disable workaround ✅ kotlin 2.0.20-Beta1, updat e libs
Browse files Browse the repository at this point in the history
  • Loading branch information
babichev.a committed Jun 21, 2024
1 parent 854f723 commit fd23544
Show file tree
Hide file tree
Showing 7 changed files with 112 additions and 134 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ kotlin.code.style=official
kotlin.mpp.enableCInteropCommonization=true
kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
kotlin.native.cacheKind=none
compose.kotlin.native.manageCacheKind=false
#kotlin.native.cacheKind=none
#compose.kotlin.native.manageCacheKind=false

org.jetbrains.compose.experimental.uikit.enabled=true

Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ compileSdk = "34"
targetSdk = "34"
minSdk = "21"
jdk = "17"
kotlin = "2.0.0"
kotlin = "2.0.20-Beta1"
agp = "8.4.2"
gms = "4.4.2"
crashlytics = "3.0.1"
crashlytics = "3.0.2"
compose = "1.6.11"
composeCompiler = "1.5.14"
coroutines = "1.8.1"
Expand All @@ -21,22 +21,22 @@ koin = "3.5.3"
kotlinx-serialization = "1.6.3"
kotlinx-datetime = "0.6.0"
napier = "2.7.1"
mokoResources = "0.24.0"
mokoResources = "0.24.1"
materialThemePrefs = "0.8.4"
androidxActivityCompose = "1.9.0"
androidxComposeTest = "1.6.7"
androidxComposeTest = "1.6.8"
androidxCoreSplashscreen = "1.0.1"
androidxLegacySupport = "1.0.0"
androidxPreference = "1.2.1"
androidxMultidex = "2.0.1"
androidxTracing = "1.2.0"
androidxLifecycle = "2.8.1"
androidxLifecycle = "2.8.2"
androidxArch = "2.2.0"
androidxTestExt = "1.1.5"
androidxTest = "1.5.2"
androidxTestOrchestrator = "1.4.2"
googleAndroidMaterial = "1.12.0"
firebase = "33.1.0"
firebase = "33.1.1"
leakCanary = "2.14"
junit = "4.13.2"
mockito = "5.11.0"
Expand Down
2 changes: 1 addition & 1 deletion iosApp/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 0dc93a6f6109335ea8cd3f91d2c87cc8c99f04a3

COCOAPODS: 1.12.1
COCOAPODS: 1.15.2
2 changes: 1 addition & 1 deletion iosApp/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

206 changes: 101 additions & 105 deletions iosApp/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 0 additions & 18 deletions iosApp/iosApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@
75CF0FBEED43B2BAC7F61B5C /* Frameworks */,
7594048B29365286005183CD /* Copy moko-resources */,
A798D07A9F8F09FA2C8C3203 /* [CP] Embed Pods Frameworks */,
0B98927A77A645700C19BF69 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -247,23 +246,6 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
0B98927A77A645700C19BF69 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n";
showEnvVarsInLog = 0;
};
7594048B29365286005183CD /* Copy moko-resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down

0 comments on commit fd23544

Please sign in to comment.