diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 62b72da2..3b6f8334 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ compileSdk = "34" # Dependencies kotlin = "1.9.22" -android-gradle-plugin = "8.2.1" +android-gradle-plugin = "8.2.2" ktlint-gradle = "12.1.0" compose = "1.5.4" diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 0f262d4a..b3743276 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -15,9 +15,9 @@ EXTERNAL SOURCES: :path: "../shared/" SPEC CHECKSUMS: - shared: ea50f7840493e1a81d5081cf342309e93b0dfa57 + shared: 81394056467cc83be297c4a24cbe685ad921e677 SwiftLint: c585ebd615d9520d7fbdbe151f527977b0534f1e PODFILE CHECKSUM: 3130ca9ec3cd58f2c60cfe8a432d7d96d89938bf -COCOAPODS: 1.12.1 +COCOAPODS: 1.14.3 diff --git a/ios/Pods/Local Podspecs/shared.podspec.json b/ios/Pods/Local Podspecs/shared.podspec.json index aae8ed6f..ef04dc97 100644 --- a/ios/Pods/Local Podspecs/shared.podspec.json +++ b/ios/Pods/Local Podspecs/shared.podspec.json @@ -27,6 +27,7 @@ "osx": null, "ios": null, "tvos": null, + "visionos": null, "watchos": null }, "swift_version": "5.0" diff --git a/ios/Pods/Manifest.lock b/ios/Pods/Manifest.lock index 0f262d4a..b3743276 100644 --- a/ios/Pods/Manifest.lock +++ b/ios/Pods/Manifest.lock @@ -15,9 +15,9 @@ EXTERNAL SOURCES: :path: "../shared/" SPEC CHECKSUMS: - shared: ea50f7840493e1a81d5081cf342309e93b0dfa57 + shared: 81394056467cc83be297c4a24cbe685ad921e677 SwiftLint: c585ebd615d9520d7fbdbe151f527977b0534f1e PODFILE CHECKSUM: 3130ca9ec3cd58f2c60cfe8a432d7d96d89938bf -COCOAPODS: 1.12.1 +COCOAPODS: 1.14.3 diff --git a/ios/Pods/Pods.xcodeproj/project.pbxproj b/ios/Pods/Pods.xcodeproj/project.pbxproj index 06d93981..78403a70 100644 --- a/ios/Pods/Pods.xcodeproj/project.pbxproj +++ b/ios/Pods/Pods.xcodeproj/project.pbxproj @@ -260,8 +260,8 @@ 46EB2E00000000 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1240; - LastUpgradeCheck = 1240; + LastSwiftUpdateCheck = 1500; + LastUpgradeCheck = 1500; }; buildConfigurationList = 46EB2E00000030 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 10.0"; diff --git a/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS-frameworks.sh b/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS-frameworks.sh index 1e57ae2b..4339d470 100755 --- a/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS-frameworks.sh +++ b/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS-frameworks.sh @@ -18,7 +18,7 @@ echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}" -SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +SWIFT_STDLIB_PATH="${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" BCSYMBOLMAP_DIR="BCSymbolMaps" diff --git a/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.debug.xcconfig b/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.debug.xcconfig index edfc6a8e..fea1e7d3 100644 --- a/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.debug.xcconfig +++ b/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.debug.xcconfig @@ -3,7 +3,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../../shared/build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) /usr/lib/swift '@executable_path/Frameworks' '@loader_path/Frameworks' -LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift +LIBRARY_SEARCH_PATHS = $(inherited) "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift OTHER_LDFLAGS = $(inherited) -l"c++" -framework "shared" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} diff --git a/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.release.xcconfig b/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.release.xcconfig index edfc6a8e..fea1e7d3 100644 --- a/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.release.xcconfig +++ b/ios/Pods/Target Support Files/Pods-KaMPKitiOS/Pods-KaMPKitiOS.release.xcconfig @@ -3,7 +3,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../../shared/build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) /usr/lib/swift '@executable_path/Frameworks' '@loader_path/Frameworks' -LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift +LIBRARY_SEARCH_PATHS = $(inherited) "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift OTHER_LDFLAGS = $(inherited) -l"c++" -framework "shared" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} diff --git a/ios/Pods/Target Support Files/shared/shared.debug.xcconfig b/ios/Pods/Target Support Files/shared/shared.debug.xcconfig index 30c20002..6d5d43eb 100644 --- a/ios/Pods/Target Support Files/shared/shared.debug.xcconfig +++ b/ios/Pods/Target Support Files/shared/shared.debug.xcconfig @@ -3,7 +3,7 @@ CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/shared FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../../shared/build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 KOTLIN_PROJECT_PATH = :shared -LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift +LIBRARY_SEARCH_PATHS = $(inherited) "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift OTHER_LDFLAGS = $(inherited) -l"c++" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} diff --git a/ios/Pods/Target Support Files/shared/shared.release.xcconfig b/ios/Pods/Target Support Files/shared/shared.release.xcconfig index 30c20002..6d5d43eb 100644 --- a/ios/Pods/Target Support Files/shared/shared.release.xcconfig +++ b/ios/Pods/Target Support Files/shared/shared.release.xcconfig @@ -3,7 +3,7 @@ CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/shared FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../../shared/build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 KOTLIN_PROJECT_PATH = :shared -LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift +LIBRARY_SEARCH_PATHS = $(inherited) "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift OTHER_LDFLAGS = $(inherited) -l"c++" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 5c924374..ae1b8c7b 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -63,41 +63,31 @@ kotlin { } } - commonMain { - dependencies { - implementation(libs.koin.core) - implementation(libs.coroutines.core) - implementation(libs.sqlDelight.coroutinesExt) - implementation(libs.bundles.ktor.common) - implementation(libs.multiplatformSettings.common) - implementation(libs.kotlinx.dateTime) - implementation(libs.touchlab.skie.annotations) - api(libs.touchlab.kermit) - } + commonMain.dependencies { + implementation(libs.koin.core) + implementation(libs.coroutines.core) + implementation(libs.sqlDelight.coroutinesExt) + implementation(libs.bundles.ktor.common) + implementation(libs.multiplatformSettings.common) + implementation(libs.kotlinx.dateTime) + implementation(libs.touchlab.skie.annotations) + api(libs.touchlab.kermit) } - commonTest { - dependencies { - implementation(libs.bundles.shared.commonTest) - } + commonTest.dependencies { + implementation(libs.bundles.shared.commonTest) } - androidMain { - dependencies { - implementation(libs.androidx.lifecycle.viewmodel) - implementation(libs.sqlDelight.android) - implementation(libs.ktor.client.okHttp) - } + androidMain.dependencies { + implementation(libs.androidx.lifecycle.viewmodel) + implementation(libs.sqlDelight.android) + implementation(libs.ktor.client.okHttp) } - val androidUnitTest by getting { - dependencies { - implementation(libs.bundles.shared.androidTest) - } + getByName("androidUnitTest").dependencies { + implementation(libs.bundles.shared.androidTest) } - iosMain { - dependencies { - implementation(libs.sqlDelight.native) - implementation(libs.ktor.client.ios) - api(libs.touchlab.kermit.simple) - } + iosMain.dependencies { + implementation(libs.sqlDelight.native) + implementation(libs.ktor.client.ios) + api(libs.touchlab.kermit.simple) } }