diff --git a/Package.swift b/Package.swift index 144b718..33b2de9 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.4 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -9,7 +9,7 @@ let package = Package( .macOS(.v10_10), .iOS(.v9), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ .library(name: "TravelKit", @@ -20,7 +20,7 @@ let package = Package( type: .static, targets: ["TravelKit"]), ], dependencies: [ - .package(name: "FMDB", url: "https://github.com/ccgus/fmdb", from: "2.7.7") + .package(name: "FMDB", url: "https://github.com/ccgus/fmdb", from: "2.7.7"), ], targets: [ .target( @@ -30,14 +30,14 @@ let package = Package( exclude: [ "Info.plist", "Config.xcconfig", - "TravelKit-Prefix.pch" + "TravelKit-Prefix.pch", ], publicHeadersPath: "PublicHeaders", cSettings: [ .headerSearchPath("PublicHeaders"), .define("USE_NSOBJECT_PARSING", to: "1"), .define("USE_TRAVELKIT_FOUNDATION", to: "1"), - .define("USE_TRAVELKIT_AS_SPM_PACKAGE", to: "1") + .define("USE_TRAVELKIT_AS_SPM_PACKAGE", to: "1"), ] ), ] diff --git a/TravelKit.podspec b/TravelKit.podspec index 317610b..b7ed4d6 100644 --- a/TravelKit.podspec +++ b/TravelKit.podspec @@ -2,22 +2,22 @@ Pod::Spec.new do |spec| spec.name = 'TravelKit' - spec.version = '3.1.2' + spec.version = '3.2.0' spec.license = 'MIT' spec.homepage = 'https://github.com/sygic-travel/apple-sdk' spec.authors = 'Tripomatic s.r.o.', 'Michal Zelinka' spec.summary = 'Travel SDK for travelling projects' - spec.source = { :http => 'https://github.com/sygic-travel/apple-sdk/releases/download/v3.1.2/TravelKit-3.1.2-iOS.zip' } + spec.source = { :http => 'https://github.com/sygic-travel/apple-sdk/releases/download/v3.2.0/TravelKit-3.2.0-iOS.zip' } spec.documentation_url = 'http://docs.sygictravelapi.com/apple-sdk/latest' spec.module_name = 'TravelKit' spec.platform = :ios - spec.ios.deployment_target = '8.2' + spec.ios.deployment_target = '9.0' spec.framework = 'SystemConfiguration' spec.ios.framework = 'CoreTelephony' spec.ios.library = 'sqlite3' - spec.ios.vendored_frameworks = 'TravelKit.framework' + spec.ios.vendored_frameworks = 'TravelKit.xcframework' end diff --git a/TravelKit.xcodeproj/project.pbxproj b/TravelKit.xcodeproj/project.pbxproj index e33db85..88221e8 100644 --- a/TravelKit.xcodeproj/project.pbxproj +++ b/TravelKit.xcodeproj/project.pbxproj @@ -1009,7 +1009,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "######################\n# Options\n######################\n\nREVEAL_ARCHIVE_IN_FINDER=true\n\nFRAMEWORK_NAME=\"${PROJECT_NAME}\"\n\nSIMULATOR_LIBRARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${FRAMEWORK_NAME}.framework\"\nDEVICE_LIBRARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphoneos/${FRAMEWORK_NAME}.framework\"\n\nSIMULATOR_DSYM_PATH=\"${SIMULATOR_LIBRARY_PATH}.dSYM\"\nDEVICE_DSYM_PATH=\"${DEVICE_LIBRARY_PATH}.dSYM\"\n\nUNIVERSAL_LIBRARY_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphoneuniversal\"\n\nFRAMEWORK=\"${UNIVERSAL_LIBRARY_DIR}/${FRAMEWORK_NAME}.framework\"\nDSYM=\"${FRAMEWORK}.dSYM\"\n\n######################\n# Build Frameworks\n######################\n\nxcrun xcodebuild clean 2>&1\n\nxcrun xcodebuild -workspace \"${PROJECT_NAME}.xcworkspace\" \\\n -scheme \"${PROJECT_NAME}-iOS\" -sdk iphonesimulator -configuration \"${CONFIGURATION}\" \\\n -arch i386 -arch x86_64 build CONFIGURATION_BUILD_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator\" 2>&1\n\nxcrun xcodebuild -workspace \"${PROJECT_NAME}.xcworkspace\" \\\n -scheme \"${PROJECT_NAME}-iOS\" -sdk iphoneos -configuration \"${CONFIGURATION}\" \\\n -arch armv7 -arch arm64 build CONFIGURATION_BUILD_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphoneos\" 2>&1\n\n######################\n# Create directory for universal\n######################\n\nrm -rf \"${UNIVERSAL_LIBRARY_DIR}\"\n\nmkdir \"${UNIVERSAL_LIBRARY_DIR}\"\n\nmkdir \"${FRAMEWORK}\"\nmkdir \"${DSYM}\"\n\n\n######################\n# Copy Device Framework files\n######################\n\ncp -r \"${DEVICE_LIBRARY_PATH}/.\" \"${FRAMEWORK}\"\ncp -r \"${DEVICE_DSYM_PATH}/.\" \"${DSYM}\"\n\n\n######################\n# Make a universal binary\n######################\n\nlipo \"${SIMULATOR_LIBRARY_PATH}/${FRAMEWORK_NAME}\" \"${DEVICE_LIBRARY_PATH}/${FRAMEWORK_NAME}\" -create -output \"${FRAMEWORK}/${FRAMEWORK_NAME}\"\n\nlipo \"${SIMULATOR_DSYM_PATH}/Contents/Resources/DWARF/${FRAMEWORK_NAME}\" \"${DEVICE_DSYM_PATH}/Contents/Resources/DWARF/${FRAMEWORK_NAME}\" -create -output \"${DSYM}/Contents/Resources/DWARF/${FRAMEWORK_NAME}\"\n\n######################\n# Copy the result to output directory\n######################\n\nOUTPUT_DIR=\"${PROJECT_DIR}/Output/${FRAMEWORK_NAME}-${CONFIGURATION}-iphoneuniversal/\"\n\nrm -rf \"$OUTPUT_DIR\"\nmkdir -p \"$OUTPUT_DIR\"\n\ncp -r \"${FRAMEWORK}\" \"$OUTPUT_DIR\"\ncp -r \"${DSYM}\" \"$OUTPUT_DIR\"\n\nif [ ${REVEAL_ARCHIVE_IN_FINDER} = true ]; then\n open \"${OUTPUT_DIR}/\"\nfi\n"; + shellScript = "######################\n# Options\n######################\n\nREVEAL_ARCHIVE_IN_FINDER=true\n\nFRAMEWORK_NAME=\"${PROJECT_NAME}\"\n\nSIMULATOR_LIBRARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${FRAMEWORK_NAME}.framework\"\nDEVICE_LIBRARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphoneos/${FRAMEWORK_NAME}.framework\"\n\nSIMULATOR_DSYM_PATH=\"${SIMULATOR_LIBRARY_PATH}.dSYM\"\nDEVICE_DSYM_PATH=\"${DEVICE_LIBRARY_PATH}.dSYM\"\n\nUNIVERSAL_LIBRARY_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphoneuniversal\"\n\nFRAMEWORK=\"${UNIVERSAL_LIBRARY_DIR}/${FRAMEWORK_NAME}.framework\"\nXCFRAMEWORK=\"${UNIVERSAL_LIBRARY_DIR}/${FRAMEWORK_NAME}.xcframework\"\nDSYM=\"${FRAMEWORK}.dSYM\"\n\n######################\n# Build Frameworks\n######################\n\nxcrun xcodebuild clean 2>&1\n\nxcrun xcodebuild -workspace \"${PROJECT_NAME}.xcworkspace\" \\\n -scheme \"${PROJECT_NAME}-iOS\" -sdk iphonesimulator -configuration \"${CONFIGURATION}\" \\\n -arch i386 -arch x86_64 -arch arm64 build \\\n CONFIGURATION_BUILD_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator\" \\\n OBJROOT=\"${OBJROOT}/DependantBuilds\" \\\n 2>&1\n\nxcrun xcodebuild -workspace \"${PROJECT_NAME}.xcworkspace\" \\\n -scheme \"${PROJECT_NAME}-iOS\" -sdk iphoneos -configuration \"${CONFIGURATION}\" \\\n -arch armv7 -arch arm64 build \\\n CONFIGURATION_BUILD_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphoneos\" \\\n OBJROOT=\"${OBJROOT}/DependantBuilds\"\n 2>&1\n\n######################\n# Create directory for universal\n######################\n\nrm -rf \"${UNIVERSAL_LIBRARY_DIR}\"\n\nmkdir \"${UNIVERSAL_LIBRARY_DIR}\"\n\nmkdir \"${FRAMEWORK}\"\nmkdir \"${DSYM}\"\n\n\n######################\n# Copy Device Framework files\n######################\n\ncp -r \"${DEVICE_LIBRARY_PATH}/.\" \"${FRAMEWORK}\"\ncp -r \"${DEVICE_DSYM_PATH}/.\" \"${DSYM}\"\n\n\n######################\n# Make a universal binary\n######################\n\nlipo \"${SIMULATOR_LIBRARY_PATH}/${FRAMEWORK_NAME}\" \"${DEVICE_LIBRARY_PATH}/${FRAMEWORK_NAME}\" -create -output \"${FRAMEWORK}/${FRAMEWORK_NAME}\"\n\n\nxcodebuild -create-xcframework \\\n -framework \"${SIMULATOR_LIBRARY_PATH}\" \\\n -framework \"${DEVICE_LIBRARY_PATH}\" \\\n -output \"${XCFRAMEWORK}\"\n\n\n\n#lipo \"${SIMULATOR_DSYM_PATH}/Contents/Resources/DWARF/${FRAMEWORK_NAME}\" \"${DEVICE_DSYM_PATH}/Contents/Resources/DWARF/${FRAMEWORK_NAME}\" -create -output \"${DSYM}/Contents/Resources/DWARF/${FRAMEWORK_NAME}\"\n\n######################\n# Copy the result to output directory\n######################\n\nOUTPUT_DIR=\"${PROJECT_DIR}/Output/${FRAMEWORK_NAME}-${CONFIGURATION}-iphoneuniversal/\"\n\nrm -rf \"$OUTPUT_DIR\"\nmkdir -p \"$OUTPUT_DIR\"\n\ncp -r \"${XCFRAMEWORK}\" \"$OUTPUT_DIR\"\n#cp -r \"${DSYM}\" \"$OUTPUT_DIR\"\n\nif [ ${REVEAL_ARCHIVE_IN_FINDER} = true ]; then\n open \"${OUTPUT_DIR}/\"\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/TravelKit/Config.xcconfig b/TravelKit/Config.xcconfig index a955674..15a43f5 100644 --- a/TravelKit/Config.xcconfig +++ b/TravelKit/Config.xcconfig @@ -9,5 +9,5 @@ // Configuration settings file format documentation can be found at: // https://help.apple.com/xcode/#/dev745c5c974 -TK_BUNDLE_VERSION = 3.1.2 -TK_BUNDLE_BUILD = 307 +TK_BUNDLE_VERSION = 3.2.0 +TK_BUNDLE_BUILD = 312 diff --git a/TravelKit/Version.h b/TravelKit/Version.h index 9558eaf..f2c1ae0 100644 --- a/TravelKit/Version.h +++ b/TravelKit/Version.h @@ -9,7 +9,7 @@ #ifndef Version_h #define Version_h -#define TRAVELKIT_VERSION "3.1.2" -#define TRAVELKIT_BUILD 307 +#define TRAVELKIT_VERSION "3.2.0" +#define TRAVELKIT_BUILD 312 #endif /* Version_h */