Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
username0x0a committed Oct 9, 2020
2 parents 8826190 + 96c2b54 commit 46a4f4b
Show file tree
Hide file tree
Showing 79 changed files with 245 additions and 94 deletions.
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

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

16 changes: 16 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"object": {
"pins": [
{
"package": "FMDB",
"repositoryURL": "https://github.com/ccgus/fmdb",
"state": {
"branch": null,
"revision": "61e51fde7f7aab6554f30ab061cc588b28a97d04",
"version": "2.7.7"
}
}
]
},
"version": 1
}
44 changes: 44 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// swift-tools-version:5.3
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "TravelKit",
platforms: [
.macOS(.v10_10),
.iOS(.v9),
.tvOS(.v9),
.watchOS(.v3)
],
products: [
.library(name: "TravelKit",
targets: ["TravelKit"]),
.library(name: "TravelKit-Dynamic",
type: .dynamic, targets: ["TravelKit"]),
.library(name: "TravelKit-Static",
type: .static, targets: ["TravelKit"]),
],
dependencies: [
.package(name: "FMDB", url: "https://github.com/ccgus/fmdb", from: "2.7.7")
],
targets: [
.target(
name: "TravelKit",
dependencies: ["FMDB"],
path: "TravelKit",
exclude: [
"Info.plist",
"Config.xcconfig",
"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")
]
),
]
)
3 changes: 3 additions & 0 deletions Package.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

// Include TravelKit config
#include 'TravelKit/Config.xcconfig'
2 changes: 1 addition & 1 deletion TravelKit.playground/contents.xcplayground
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<playground version='5.0' target-platform='macos' display-mode='raw' executeOnSourceChanges='false'>
<playground version='5.0' target-platform='macos' display-mode='raw' buildActiveScheme='true'>
<timeline fileName='timeline.xctimeline'/>
</playground>
26 changes: 18 additions & 8 deletions TravelKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 53;
objects = {

/* Begin PBXAggregateTarget section */
Expand Down Expand Up @@ -141,6 +141,9 @@
D69831A81EF7AE8A002776BE /* TKToursManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D69831A41EF7AE8A002776BE /* TKToursManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
D69831A91EF7AE8A002776BE /* TKToursManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D69831A41EF7AE8A002776BE /* TKToursManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
D69831AA1EF7AE8A002776BE /* TKToursManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D69831A41EF7AE8A002776BE /* TKToursManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
D6A6236B252F536E00D9B7CE /* Version.h in Headers */ = {isa = PBXBuildFile; fileRef = D6A6236A252F533200D9B7CE /* Version.h */; settings = {ATTRIBUTES = (Public, ); }; };
D6A62370252F536F00D9B7CE /* Version.h in Headers */ = {isa = PBXBuildFile; fileRef = D6A6236A252F533200D9B7CE /* Version.h */; settings = {ATTRIBUTES = (Public, ); }; };
D6A62375252F536F00D9B7CE /* Version.h in Headers */ = {isa = PBXBuildFile; fileRef = D6A6236A252F533200D9B7CE /* Version.h */; settings = {ATTRIBUTES = (Public, ); }; };
D6B0AD921FBAE35400E8CE12 /* TKAPIDefinitions.h in Headers */ = {isa = PBXBuildFile; fileRef = D6B0AD911FBAE35400E8CE12 /* TKAPIDefinitions.h */; };
D6B0AD931FBAE35400E8CE12 /* TKAPIDefinitions.h in Headers */ = {isa = PBXBuildFile; fileRef = D6B0AD911FBAE35400E8CE12 /* TKAPIDefinitions.h */; };
D6B0AD941FBAE35400E8CE12 /* TKAPIDefinitions.h in Headers */ = {isa = PBXBuildFile; fileRef = D6B0AD911FBAE35400E8CE12 /* TKAPIDefinitions.h */; };
Expand Down Expand Up @@ -330,6 +333,7 @@
D698319F1EF3F051002776BE /* TKTour.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKTour.m; sourceTree = "<group>"; };
D69831A31EF7AE8A002776BE /* TKToursManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKToursManager.m; sourceTree = "<group>"; };
D69831A41EF7AE8A002776BE /* TKToursManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKToursManager.h; sourceTree = "<group>"; };
D6A6236A252F533200D9B7CE /* Version.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Version.h; sourceTree = "<group>"; };
D6B0AD911FBAE35400E8CE12 /* TKAPIDefinitions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKAPIDefinitions.h; sourceTree = "<group>"; };
D6B2A1291E530AFD005509E8 /* TravelKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TravelKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D6B2A1541E530F60005509E8 /* TravelKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TravelKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -523,6 +527,7 @@
EF0D9D671EFAAB3800C50AE2 /* Database */,
D68E94801F06301F009E2C9C /* General */,
D6F2CCE520D3BFFD00E06245 /* Categories */,
D6A6236A252F533200D9B7CE /* Version.h */,
);
name = Sources;
sourceTree = "<group>";
Expand Down Expand Up @@ -694,6 +699,7 @@
D6B2A1431E530B11005509E8 /* TKReference.h in Headers */,
D6E3B7BC1FA0A31700E1CCAC /* TKTrip.h in Headers */,
D6B2A13B1E530B11005509E8 /* TKMapRegion.h in Headers */,
D6A62375252F536F00D9B7CE /* Version.h in Headers */,
D698319E1EF3EB79002776BE /* TKTour+Private.h in Headers */,
D6B2A13F1E530B11005509E8 /* TKPlace.h in Headers */,
D6B2A1391E530B11005509E8 /* NSObject+Parsing.h in Headers */,
Expand Down Expand Up @@ -752,6 +758,7 @@
D6B2A16E1E531097005509E8 /* TKReference.h in Headers */,
D6E3B7B41FA0A00800E1CCAC /* TKTrip.h in Headers */,
D6B2A1661E531097005509E8 /* TKMapRegion.h in Headers */,
D6A6236B252F536E00D9B7CE /* Version.h in Headers */,
D698319C1EF3EB79002776BE /* TKTour+Private.h in Headers */,
D64B612820064D940098ADDF /* TKDirectionsManager.h in Headers */,
D6B2A16A1E531097005509E8 /* TKPlace.h in Headers */,
Expand Down Expand Up @@ -810,6 +817,7 @@
D6C3D0721E4DE7B400EBB54F /* TKAPI+Private.h in Headers */,
D6C3D0661E4DE29C00EBB54F /* NSObject+Parsing.h in Headers */,
D6E3B7B81FA0A31600E1CCAC /* TKTrip.h in Headers */,
D6A62370252F536F00D9B7CE /* Version.h in Headers */,
D698319D1EF3EB79002776BE /* TKTour+Private.h in Headers */,
D6C3D0511E4DD36200EBB54F /* TravelKit.h in Headers */,
D6C3D05A1E4DDAE500EBB54F /* TKPlace.h in Headers */,
Expand Down Expand Up @@ -923,7 +931,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = TK;
LastUpgradeCheck = 1170;
LastUpgradeCheck = 1200;
ORGANIZATIONNAME = Tripomatic;
TargetAttributes = {
D6B2A1281E530AFD005509E8 = {
Expand All @@ -945,7 +953,7 @@
};
};
buildConfigurationList = D6C3D0461E4DD36200EBB54F /* Build configuration list for PBXProject "TravelKit" */;
compatibilityVersion = "Xcode 10.0";
compatibilityVersion = "Xcode 11.4";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
Expand Down Expand Up @@ -1001,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\n#xcodebuild clean\n\nxcodebuild -workspace ${PROJECT_NAME}.xcworkspace -scheme ${PROJECT_NAME}-iOS -sdk iphonesimulator -configuration ${CONFIGURATION} build CONFIGURATION_BUILD_DIR=${BUILD_DIR}/${CONFIGURATION}-iphonesimulator 2>&1\n\nxcodebuild -workspace ${PROJECT_NAME}.xcworkspace -scheme ${PROJECT_NAME}-iOS -sdk iphoneos -configuration ${CONFIGURATION} 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\"\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";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -1230,6 +1238,7 @@
CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
Expand Down Expand Up @@ -1268,7 +1277,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "$(PRODUCT_NAME:c99extidentifier)/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = YES;
Expand All @@ -1291,7 +1300,7 @@
"-Wfloat-equal",
"-Wundef",
);
WATCHOS_DEPLOYMENT_TARGET = 2.2;
WATCHOS_DEPLOYMENT_TARGET = 3.0;
};
name = Debug;
};
Expand Down Expand Up @@ -1323,6 +1332,7 @@
CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
Expand Down Expand Up @@ -1359,7 +1369,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "$(PRODUCT_NAME:c99extidentifier)/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LLVM_LTO = YES;
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.10;
Expand All @@ -1381,7 +1391,7 @@
"-Wfloat-equal",
"-Wundef",
);
WATCHOS_DEPLOYMENT_TARGET = 2.2;
WATCHOS_DEPLOYMENT_TARGET = 3.0;
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildSystemType</key>
<string>Original</string>
<key>PreviewsEnabled</key>
<false/>
</dict>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1170"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1170"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1170"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1170"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
8 changes: 8 additions & 0 deletions TravelKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildSystemType</key>
<string>Original</string>
<key>PreviewsEnabled</key>
<false/>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion TravelKit/Foundation+TravelKit.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <objc/runtime.h>
#import "Foundation+TravelKit.h"
#import <TravelKit/Foundation+TravelKit.h>


@implementation NSObject (TravelKit)
Expand Down
2 changes: 1 addition & 1 deletion TravelKit/NSDate+Tripomatic.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// http://www.unicode.org/reports/tr35/tr35-31/tr35-dates.html#Date_Format_Patterns
//

#import "NSDate+Tripomatic.h"
#import <TravelKit/NSDate+Tripomatic.h>


@implementation NSLocale (Tripomatic)
Expand Down
2 changes: 1 addition & 1 deletion TravelKit/NSObject+Parsing.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright (c) 2015 Tripomatic. All rights reserved.
//

#import "NSObject+Parsing.h"
#import <TravelKit/NSObject+Parsing.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/Foundation+TravelKit.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/NSDate+Tripomatic.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/NSObject+Parsing.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKCollection.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKCollectionsQuery.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKDirection.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKDirectionsManager.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKEnvironment.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKEventsManager.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKFavoritesManager.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKMapPlaceAnnotation.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKMapRegion.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKMapWorker.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKMedium.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKPlace.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKPlacesManager.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKPlacesQuery.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKReference.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKSession.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKSessionManager.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKTour.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKToursManager.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKToursQuery.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKTrip.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TKTripsManager.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/TravelKit.h
1 change: 1 addition & 0 deletions TravelKit/PublicHeaders/TravelKit/Version.h
2 changes: 1 addition & 1 deletion TravelKit/TKAPI+Private.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import <Foundation/Foundation.h>

#import <TravelKit/TKAPIDefinitions.h>
#import "TKAPIDefinitions.h"

#import <TravelKit/TKPlace.h>
#import <TravelKit/TKCollection.h>
Expand Down
Loading

0 comments on commit 46a4f4b

Please sign in to comment.