Skip to content

Commit

Permalink
Merge pull request #98 from fassko/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@fassko
fassko authored Nov 12, 2017
2 parents dedf693 + 464fea5 commit a6ccda9
Show file tree
Hide file tree
Showing 31 changed files with 397 additions and 385 deletions.
1 change: 0 additions & 1 deletion Bridging-Header.h
View file

This file was deleted.

Binary file removed BuddyBuildSDK.framework/BuddyBuildSDK
View file
Binary file not shown.
180 changes: 0 additions & 180 deletions BuddyBuildSDK.framework/Headers/BuddyBuildSDK.h
View file

This file was deleted.

6 changes: 0 additions & 6 deletions BuddyBuildSDK.framework/Modules/module.modulemap
View file

This file was deleted.

1 change: 0 additions & 1 deletion BuddyBuildSDK.framework/build.num
View file

This file was deleted.

38 changes: 21 additions & 17 deletions Dodies.lv.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
0A1701DD013F5E257D849F81 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23AF73FE2269A626C5FB6864 /* AVFoundation.framework */; };
32BB1BC04C8459BEB4B1C47F /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FA100D0445174EEB4D06F4F /* CoreText.framework */; };
5C710D0BEA212B0E11380BB1 /* BuddyBuildSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BB2F6AC4978EC2D2C482A2B /* BuddyBuildSDK.framework */; };
6304EAFF1BA5C25900B7CD49 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6304EAFE1BA5C25900B7CD49 /* Settings.bundle */; };
6304EB011BA5C2C700B7CD49 /* MapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6304EB001BA5C2C700B7CD49 /* MapViewController.swift */; };
63330EC51DCF7B8F002194A3 /* Dodies_lvUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63330EC41DCF7B8F002194A3 /* Dodies_lvUITests.swift */; };
Expand Down Expand Up @@ -110,7 +107,6 @@
1AE186A438C85C4E3F9554EE /* Pods-Dodies.lv.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Dodies.lv.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Dodies.lv/Pods-Dodies.lv.debug.xcconfig"; sourceTree = "<group>"; };
23AF73FE2269A626C5FB6864 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
327B1D6E038E71252FC315F2 /* Pods_Dodies_lv.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Dodies_lv.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3BB2F6AC4978EC2D2C482A2B /* BuddyBuildSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BuddyBuildSDK.framework; path = BuddyBuildSDK.framework; sourceTree = "<group>"; };
4FA100D0445174EEB4D06F4F /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
51BD83EEEE8577C71768DA2A /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
6304EAFE1BA5C25900B7CD49 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
Expand Down Expand Up @@ -184,7 +180,6 @@
63F5DC6D1C8358F200AEB195 /* AboutViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
63FB43D01F8A20DF002033CE /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
73E1434CC811198D7ABBC850 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
7A3205FDCCB47ADBC42FA4DE /* Bridging-Header.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };
7EA935C440CF8789F4B31728 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
BBDFEB8CA3AE6DB6339C9371 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
E77C2166C966DA4C74287D2E /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; };
Expand All @@ -204,13 +199,10 @@
buildActionMask = 2147483647;
files = (
D287D980B694B6B5EDF31116 /* Pods_Dodies_lv.framework in Frameworks */,
5C710D0BEA212B0E11380BB1 /* BuddyBuildSDK.framework in Frameworks */,
B0A6015EEB563D5CE1632337 /* AssetsLibrary.framework in Frameworks */,
32BB1BC04C8459BEB4B1C47F /* CoreText.framework in Frameworks */,
B3657DB1D51808CC9F398BAD /* CoreTelephony.framework in Frameworks */,
DCA640AAC54F50636DE9CA48 /* SystemConfiguration.framework in Frameworks */,
E85A8E3394C58810FCB21913 /* QuartzCore.framework in Frameworks */,
0A1701DD013F5E257D849F81 /* AVFoundation.framework in Frameworks */,
E9DE3C02EFB5BBC2D2729C40 /* CoreMedia.framework in Frameworks */,
85C729650F800A83805648BF /* CoreVideo.framework in Frameworks */,
);
Expand Down Expand Up @@ -247,7 +239,6 @@
636EA8331BA5BDF40071397A /* Products */,
990DC17D92FB619120B373BE /* Pods */,
8C2F2D88B0A6E2B639989CBF /* Frameworks */,
7A3205FDCCB47ADBC42FA4DE /* Bridging-Header.h */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -364,7 +355,6 @@
isa = PBXGroup;
children = (
327B1D6E038E71252FC315F2 /* Pods_Dodies_lv.framework */,
3BB2F6AC4978EC2D2C482A2B /* BuddyBuildSDK.framework */,
E77C2166C966DA4C74287D2E /* AssetsLibrary.framework */,
4FA100D0445174EEB4D06F4F /* CoreText.framework */,
7EA935C440CF8789F4B31728 /* CoreTelephony.framework */,
Expand Down Expand Up @@ -443,7 +433,7 @@
TargetAttributes = {
63330EC11DCF7B8F002194A3 = {
CreatedOnToolsVersion = 8.1;
ProvisioningStyle = Automatic;
ProvisioningStyle = Manual;
TestTargetID = 636EA8311BA5BDF40071397A;
};
636EA8311BA5BDF40071397A = {
Expand Down Expand Up @@ -605,7 +595,11 @@
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Dodies.lv/Pods-Dodies.lv-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Cache/Cache.framework",
"${BUILT_PRODUCTS_DIR}/Hue/Hue.framework",
"${BUILT_PRODUCTS_DIR}/Imaginary/Imaginary.framework",
"${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework",
"${BUILT_PRODUCTS_DIR}/Lightbox/Lightbox.framework",
"${BUILT_PRODUCTS_DIR}/Localize-Swift/Localize_Swift.framework",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework.dSYM",
Expand All @@ -615,7 +609,11 @@
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cache.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hue.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Imaginary.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kingfisher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lightbox.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Localize_Swift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mapbox.framework",
"${DWARF_DSYM_FOLDER_PATH}/Mapbox.framework.dSYM",
Expand Down Expand Up @@ -719,12 +717,14 @@
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = 3SGNZQGS68;
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Dodies.lvUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.fassko.Dodies-lvUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "334705a6-af7c-42ae-8215-32bf7fe3481d";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.0;
TEST_TARGET_NAME = Dodies.lv;
Expand All @@ -739,12 +739,14 @@
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = 3SGNZQGS68;
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Dodies.lvUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.fassko.Dodies-lvUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "334705a6-af7c-42ae-8215-32bf7fe3481d";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
TEST_TARGET_NAME = Dodies.lv;
Expand Down Expand Up @@ -864,6 +866,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer: Kristaps Grinbergs (MMGQCA8E72)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Kristaps Grinbergs (MMGQCA8E72)";
DEVELOPMENT_TEAM = 3SGNZQGS68;
ENABLE_BITCODE = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand All @@ -876,7 +879,7 @@
PROVISIONING_PROFILE = "6ce7d206-45f0-4e73-8a20-310adbcbce4b";
PROVISIONING_PROFILE_SPECIFIER = "match Development com.fassko.Dodies-lv";
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_PRECOMPILE_BRIDGING_HEADER = NO;
SWIFT_VERSION = 4.0;
};
Expand All @@ -890,6 +893,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution: Kristaps Grinbergs (3SGNZQGS68)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Kristaps Grinbergs (3SGNZQGS68)";
DEVELOPMENT_TEAM = 3SGNZQGS68;
ENABLE_BITCODE = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand All @@ -902,7 +906,7 @@
PROVISIONING_PROFILE = "334705a6-af7c-42ae-8215-32bf7fe3481d";
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.fassko.Dodies-lv";
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_PRECOMPILE_BRIDGING_HEADER = NO;
SWIFT_VERSION = 4.0;
};
Expand Down
4 changes: 1 addition & 3 deletions Dodies.lv/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {

Realm.Configuration.defaultConfiguration = Realm.Configuration(
schemaVersion: 2,
schemaVersion: 3,
migrationBlock: { migration, oldSchemaVersion in

if (oldSchemaVersion < 1) {
Expand All @@ -35,9 +35,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}

private func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
BuddyBuildSDK.setup()


Fabric.with([Crashlytics.self])

return true
Expand Down
Loading

0 comments on commit a6ccda9

Please sign in to comment.