diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 93fd6be8..22ced69f 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -1,13 +1,14 @@ object Versions { - const val kotlin = "1.5.21" - const val kotlinCoroutines = "1.5.1-native-mt" - const val ktor = "1.6.2" + const val kotlin = "1.5.30" + const val kotlinCoroutines = "1.5.2-native-mt" + const val ktor = "1.6.3" const val kotlinxSerialization = "1.2.2" const val koin = "3.1.2" const val lifecycle = "2.2.0-alpha01" - const val compose = "1.0.2" - const val nav_compose = "2.4.0-alpha08" + + const val compose = "1.1.0-alpha04" + const val nav_compose = "2.4.0-alpha09" const val slf4j = "1.7.30" const val kermit = "0.1.8" diff --git a/common/common.podspec b/common/common.podspec index a732d01a..904aec8b 100644 --- a/common/common.podspec +++ b/common/common.podspec @@ -7,7 +7,6 @@ Pod::Spec.new do |spec| spec.license = '' spec.summary = 'BikeShare common module' - spec.static_framework = true spec.vendored_frameworks = "build/cocoapods/framework/common.framework" spec.libraries = "c++" spec.module_name = "#{spec.name}_umbrella" @@ -17,13 +16,8 @@ Pod::Spec.new do |spec| spec.pod_target_xcconfig = { - 'KOTLIN_TARGET[sdk=iphonesimulator*]' => 'ios_x64', - 'KOTLIN_TARGET[sdk=iphoneos*]' => 'ios_arm', - 'KOTLIN_TARGET[sdk=watchsimulator*]' => 'watchos_x64', - 'KOTLIN_TARGET[sdk=watchos*]' => 'watchos_arm', - 'KOTLIN_TARGET[sdk=appletvsimulator*]' => 'tvos_x64', - 'KOTLIN_TARGET[sdk=appletvos*]' => 'tvos_arm64', - 'KOTLIN_TARGET[sdk=macosx*]' => 'macos_x64' + 'KOTLIN_PROJECT_PATH' => ':common', + 'PRODUCT_MODULE_NAME' => 'common', } spec.script_phases = [ @@ -32,10 +26,15 @@ Pod::Spec.new do |spec| :execution_position => :before_compile, :shell_path => '/bin/sh', :script => <<-SCRIPT + if [ "YES" = "$COCOAPODS_SKIP_KOTLIN_BUILD" ]; then + echo "Skipping Gradle build task invocation due to COCOAPODS_SKIP_KOTLIN_BUILD environment variable set to \"YES\"" + exit 0 + fi set -ev REPO_ROOT="$PODS_TARGET_SRCROOT" - "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" :common:syncFramework \ - -Pkotlin.native.cocoapods.target=$KOTLIN_TARGET \ + "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \ + -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \ + -Pkotlin.native.cocoapods.archs="$ARCHS" \ -Pkotlin.native.cocoapods.configuration=$CONFIGURATION \ -Pkotlin.native.cocoapods.cflags="$OTHER_CFLAGS" \ -Pkotlin.native.cocoapods.paths.headers="$HEADER_SEARCH_PATHS" \ diff --git a/ios/BikeShare/Podfile.lock b/ios/BikeShare/Podfile.lock index 5ad77a9d..766f534f 100644 --- a/ios/BikeShare/Podfile.lock +++ b/ios/BikeShare/Podfile.lock @@ -18,7 +18,7 @@ EXTERNAL SOURCES: :path: "../../common" SPEC CHECKSUMS: - common: 71b0c52c1eec02792ae942ca52e7e05066dbe4af + common: 8ad42eef31288761720e98db2059735237a5ec68 Introspect: 50c17d6b1f091f4cfd678ea8a4157ac071808fe3 SwiftUIRefresh: ca6ae2718d25aad5dd68bbf5d2ae36ef6ade98bf diff --git a/ios/BikeShare/Pods/Local Podspecs/common.podspec.json b/ios/BikeShare/Pods/Local Podspecs/common.podspec.json index 84bf8fe6..c33e0586 100644 --- a/ios/BikeShare/Pods/Local Podspecs/common.podspec.json +++ b/ios/BikeShare/Pods/Local Podspecs/common.podspec.json @@ -9,25 +9,19 @@ "authors": "", "license": "", "summary": "BikeShare common module", - "static_framework": true, "vendored_frameworks": "build/cocoapods/framework/common.framework", "libraries": "c++", "module_name": "common_umbrella", "pod_target_xcconfig": { - "KOTLIN_TARGET[sdk=iphonesimulator*]": "ios_x64", - "KOTLIN_TARGET[sdk=iphoneos*]": "ios_arm", - "KOTLIN_TARGET[sdk=watchsimulator*]": "watchos_x86", - "KOTLIN_TARGET[sdk=watchos*]": "watchos_arm", - "KOTLIN_TARGET[sdk=appletvsimulator*]": "tvos_x64", - "KOTLIN_TARGET[sdk=appletvos*]": "tvos_arm64", - "KOTLIN_TARGET[sdk=macosx*]": "macos_x64" + "KOTLIN_PROJECT_PATH": ":common", + "PRODUCT_MODULE_NAME": "common" }, "script_phases": [ { "name": "Build common", "execution_position": "before_compile", "shell_path": "/bin/sh", - "script": " set -ev\n REPO_ROOT=\"$PODS_TARGET_SRCROOT\"\n \"$REPO_ROOT/../gradlew\" -p \"$REPO_ROOT\" :common:syncFramework -Pkotlin.native.cocoapods.target=$KOTLIN_TARGET -Pkotlin.native.cocoapods.configuration=$CONFIGURATION -Pkotlin.native.cocoapods.cflags=\"$OTHER_CFLAGS\" -Pkotlin.native.cocoapods.paths.headers=\"$HEADER_SEARCH_PATHS\" -Pkotlin.native.cocoapods.paths.frameworks=\"$FRAMEWORK_SEARCH_PATHS\"\n" + "script": " if [ \"YES\" = \"$COCOAPODS_SKIP_KOTLIN_BUILD\" ]; then\n echo \"Skipping Gradle build task invocation due to COCOAPODS_SKIP_KOTLIN_BUILD environment variable set to \"YES\"\"\n exit 0\n fi\n set -ev\n REPO_ROOT=\"$PODS_TARGET_SRCROOT\"\n \"$REPO_ROOT/../gradlew\" -p \"$REPO_ROOT\" $KOTLIN_PROJECT_PATH:syncFramework -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME -Pkotlin.native.cocoapods.archs=\"$ARCHS\" -Pkotlin.native.cocoapods.configuration=$CONFIGURATION -Pkotlin.native.cocoapods.cflags=\"$OTHER_CFLAGS\" -Pkotlin.native.cocoapods.paths.headers=\"$HEADER_SEARCH_PATHS\" -Pkotlin.native.cocoapods.paths.frameworks=\"$FRAMEWORK_SEARCH_PATHS\"\n" } ], "platforms": { diff --git a/ios/BikeShare/Pods/Manifest.lock b/ios/BikeShare/Pods/Manifest.lock index 5ad77a9d..766f534f 100644 --- a/ios/BikeShare/Pods/Manifest.lock +++ b/ios/BikeShare/Pods/Manifest.lock @@ -18,7 +18,7 @@ EXTERNAL SOURCES: :path: "../../common" SPEC CHECKSUMS: - common: 71b0c52c1eec02792ae942ca52e7e05066dbe4af + common: 8ad42eef31288761720e98db2059735237a5ec68 Introspect: 50c17d6b1f091f4cfd678ea8a4157ac071808fe3 SwiftUIRefresh: ca6ae2718d25aad5dd68bbf5d2ae36ef6ade98bf diff --git a/ios/BikeShare/Pods/Pods.xcodeproj/project.pbxproj b/ios/BikeShare/Pods/Pods.xcodeproj/project.pbxproj index 953466fa..fd56987f 100644 --- a/ios/BikeShare/Pods/Pods.xcodeproj/project.pbxproj +++ b/ios/BikeShare/Pods/Pods.xcodeproj/project.pbxproj @@ -9,9 +9,9 @@ /* Begin PBXAggregateTarget section */ 8217FBB9D1218C346C0781D0B8F2BBE8 /* common */ = { isa = PBXAggregateTarget; - buildConfigurationList = 22394E93158CF2B7CD93BED2C7C16E84 /* Build configuration list for PBXAggregateTarget "common" */; + buildConfigurationList = F11FEA02DA0EC11D42BB6656A90E71FA /* Build configuration list for PBXAggregateTarget "common" */; buildPhases = ( - 1507B811A92121AABDBE5909D1BD0742 /* [CP-User] Build common */, + 43D98DE986E8E206E7884FFE41159824 /* [CP-User] Build common */, ); dependencies = ( ); @@ -402,16 +402,6 @@ /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - 1507B811A92121AABDBE5909D1BD0742 /* [CP-User] Build common */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - name = "[CP-User] Build common"; - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = " set -ev\n REPO_ROOT=\"$PODS_TARGET_SRCROOT\"\n \"$REPO_ROOT/../gradlew\" -p \"$REPO_ROOT\" :common:syncFramework -Pkotlin.native.cocoapods.target=$KOTLIN_TARGET -Pkotlin.native.cocoapods.configuration=$CONFIGURATION -Pkotlin.native.cocoapods.cflags=\"$OTHER_CFLAGS\" -Pkotlin.native.cocoapods.paths.headers=\"$HEADER_SEARCH_PATHS\" -Pkotlin.native.cocoapods.paths.frameworks=\"$FRAMEWORK_SEARCH_PATHS\"\n"; - }; 27387D83EC20A17EBD3FD3DD6B9C4C4A /* Copy generated compatibility header */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -436,6 +426,16 @@ shellPath = /bin/sh; shellScript = "COMPATIBILITY_HEADER_PATH=\"${BUILT_PRODUCTS_DIR}/Swift Compatibility Header/${PRODUCT_MODULE_NAME}-Swift.h\"\nMODULE_MAP_PATH=\"${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}.modulemap\"\n\nditto \"${DERIVED_SOURCES_DIR}/${PRODUCT_MODULE_NAME}-Swift.h\" \"${COMPATIBILITY_HEADER_PATH}\"\nditto \"${PODS_ROOT}/Headers/Public/Introspect/Introspect.modulemap\" \"${MODULE_MAP_PATH}\"\nditto \"${PODS_ROOT}/Headers/Public/Introspect/Introspect-umbrella.h\" \"${BUILT_PRODUCTS_DIR}\"\nprintf \"\\n\\nmodule ${PRODUCT_MODULE_NAME}.Swift {\\n header \\\"${COMPATIBILITY_HEADER_PATH}\\\"\\n requires objc\\n}\\n\" >> \"${MODULE_MAP_PATH}\"\n"; }; + 43D98DE986E8E206E7884FFE41159824 /* [CP-User] Build common */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + name = "[CP-User] Build common"; + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = " if [ \"YES\" = \"$COCOAPODS_SKIP_KOTLIN_BUILD\" ]; then\n echo \"Skipping Gradle build task invocation due to COCOAPODS_SKIP_KOTLIN_BUILD environment variable set to \"YES\"\"\n exit 0\n fi\n set -ev\n REPO_ROOT=\"$PODS_TARGET_SRCROOT\"\n \"$REPO_ROOT/../gradlew\" -p \"$REPO_ROOT\" $KOTLIN_PROJECT_PATH:syncFramework -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME -Pkotlin.native.cocoapods.archs=\"$ARCHS\" -Pkotlin.native.cocoapods.configuration=$CONFIGURATION -Pkotlin.native.cocoapods.cflags=\"$OTHER_CFLAGS\" -Pkotlin.native.cocoapods.paths.headers=\"$HEADER_SEARCH_PATHS\" -Pkotlin.native.cocoapods.paths.frameworks=\"$FRAMEWORK_SEARCH_PATHS\"\n"; + }; 7FB7331AE5D2FC6790F2869B7CE74D92 /* Copy generated compatibility header */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -549,9 +549,9 @@ }; name = Debug; }; - 525831EE7A270ED1CF9BD347742EDDD9 /* Debug */ = { + 400AC3C507EFCE6A155B28DEF8615665 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0F3F3D8B720EA8446A3FFA6CC7D017D6 /* common.debug.xcconfig */; + baseConfigurationReference = 049A62BA71C9759A81E599890BD82642 /* common.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_WEAK = NO; @@ -563,8 +563,9 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; }; - name = Debug; + name = Release; }; 539F40C8ED891FE90EABF80FF09337BD /* Debug */ = { isa = XCBuildConfiguration; @@ -589,6 +590,23 @@ }; name = Debug; }; + 875E16A6D1475AA712D357FAABBAF685 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 0F3F3D8B720EA8446A3FFA6CC7D017D6 /* common.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_OBJC_WEAK = NO; + CODE_SIGN_IDENTITY = "iPhone Developer"; + IPHONEOS_DEPLOYMENT_TARGET = 4.3; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; 8A3650F6C8AC2EFFA814EA61C37468B1 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -817,36 +835,9 @@ }; name = Release; }; - FE7358C343E1336EE23FDD5B6EF53049 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 049A62BA71C9759A81E599890BD82642 /* common.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_OBJC_WEAK = NO; - CODE_SIGN_IDENTITY = "iPhone Developer"; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 22394E93158CF2B7CD93BED2C7C16E84 /* Build configuration list for PBXAggregateTarget "common" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 525831EE7A270ED1CF9BD347742EDDD9 /* Debug */, - FE7358C343E1336EE23FDD5B6EF53049 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 2AC11F0754A5D135A2469813639D6E76 /* Build configuration list for PBXNativeTarget "Pods-BikeShare" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -874,6 +865,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + F11FEA02DA0EC11D42BB6656A90E71FA /* Build configuration list for PBXAggregateTarget "common" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 875E16A6D1475AA712D357FAABBAF685 /* Debug */, + 400AC3C507EFCE6A155B28DEF8615665 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; FD9D88F5E2B4B726D65D402E0B861615 /* Build configuration list for PBXNativeTarget "Introspect" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/ios/BikeShare/Pods/Target Support Files/common/common.debug.xcconfig b/ios/BikeShare/Pods/Target Support Files/common/common.debug.xcconfig index f9daaa94..4bde8e4f 100644 --- a/ios/BikeShare/Pods/Target Support Files/common/common.debug.xcconfig +++ b/ios/BikeShare/Pods/Target Support Files/common/common.debug.xcconfig @@ -1,17 +1,12 @@ CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/common FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../../../common/build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -KOTLIN_TARGET[sdk=appletvos*] = tvos_arm64 -KOTLIN_TARGET[sdk=appletvsimulator*] = tvos_x64 -KOTLIN_TARGET[sdk=iphoneos*] = ios_arm -KOTLIN_TARGET[sdk=iphonesimulator*] = ios_x64 -KOTLIN_TARGET[sdk=macosx*] = macos_x64 -KOTLIN_TARGET[sdk=watchos*] = watchos_arm -KOTLIN_TARGET[sdk=watchsimulator*] = watchos_x86 +KOTLIN_PROJECT_PATH = :common PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../../common PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +PRODUCT_MODULE_NAME = common SKIP_INSTALL = YES USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/ios/BikeShare/Pods/Target Support Files/common/common.release.xcconfig b/ios/BikeShare/Pods/Target Support Files/common/common.release.xcconfig index f9daaa94..4bde8e4f 100644 --- a/ios/BikeShare/Pods/Target Support Files/common/common.release.xcconfig +++ b/ios/BikeShare/Pods/Target Support Files/common/common.release.xcconfig @@ -1,17 +1,12 @@ CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/common FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../../../common/build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -KOTLIN_TARGET[sdk=appletvos*] = tvos_arm64 -KOTLIN_TARGET[sdk=appletvsimulator*] = tvos_x64 -KOTLIN_TARGET[sdk=iphoneos*] = ios_arm -KOTLIN_TARGET[sdk=iphonesimulator*] = ios_x64 -KOTLIN_TARGET[sdk=macosx*] = macos_x64 -KOTLIN_TARGET[sdk=watchos*] = watchos_arm -KOTLIN_TARGET[sdk=watchsimulator*] = watchos_x86 +KOTLIN_PROJECT_PATH = :common PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../../common PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +PRODUCT_MODULE_NAME = common SKIP_INSTALL = YES USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES