Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@username0x0a
username0x0a committed Jun 30, 2021
2 parents 25614dc + 1131317 commit fc8ad1d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions Package.swift
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -9,7 +9,7 @@ let package = Package(
.macOS(.v10_10),
.iOS(.v9),
.tvOS(.v9),
.watchOS(.v3)
.watchOS(.v3),
],
products: [
.library(name: "TravelKit",
Expand All @@ -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(
Expand All @@ -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"),
]
),
]
Expand Down
8 changes: 4 additions & 4 deletions TravelKit.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion TravelKit.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
4 changes: 2 additions & 2 deletions TravelKit/Config.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions TravelKit/Version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit fc8ad1d

Please sign in to comment.