Skip to content
This repository has been archived by the owner on Jan 10, 2024. It is now read-only.

Commit

Permalink
spm update
Browse files Browse the repository at this point in the history
  • Loading branch information
@tgymnich
tgymnich committed Jan 11, 2021
1 parent 8c58776 commit dd90b97
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 79 deletions.
72 changes: 1 addition & 71 deletions TUM Campus App.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@
22E5303B2217698300A29992 /* Credentials.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = "<group>"; };
22E5303E22176DDE00A29992 /* CalendarEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarEvent.swift; sourceTree = "<group>"; };
22E67CA6248AE4390066682D /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
22E67CDD248AEA010066682D /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
22EDE42424B0B13500DBEC03 /* PersonDetailCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonDetailCollectionViewController.swift; sourceTree = "<group>"; };
22EDE42624B0B53B00DBEC03 /* PersonDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonDetail.swift; sourceTree = "<group>"; };
22EDE42824B0CCBF00DBEC03 /* PersonDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonDetailViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -430,7 +429,6 @@
2277E92621D93C3400D7FF3F /* TUM Campus AppTests */,
2277E93121D93C3400D7FF3F /* TUM Campus AppUITests */,
2277E90D21D93C3300D7FF3F /* Products */,
22E67CC2248AE69D0066682D /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -664,14 +662,6 @@
path = Calendar;
sourceTree = "<group>";
};
22E67CC2248AE69D0066682D /* Frameworks */ = {
isa = PBXGroup;
children = (
22E67CDD248AEA010066682D /* libsqlite3.tbd */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -1047,10 +1037,6 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(PROJECT_DIR)/TUM\\ Campus\\ App/Frameworks",
"$(inherited)",
);
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand All @@ -1076,11 +1062,6 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
USER_HEADER_SEARCH_PATHS = (
"$(SRCROOT)/TUM",
Campus,
App/Headers,
);
};
name = Debug;
};
Expand Down Expand Up @@ -1123,10 +1104,6 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(PROJECT_DIR)/TUM\\ Campus\\ App/Frameworks",
"$(inherited)",
);
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -1145,11 +1122,6 @@
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
USER_HEADER_SEARCH_PATHS = (
"$(SRCROOT)/TUM",
Campus,
App/Headers,
);
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -1165,19 +1137,8 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 43;
DEVELOPMENT_TEAM = LQ83GZ8GRK;
FRAMEWORK_SEARCH_PATHS = (
"$(PROJECT_DIR)/TUM\\ Campus\\ App/Frameworks",
"$(PROJECT_DIR)/TUM\\ Campus\\ App/Frameworks",
"$(PROJECT_DIR)/TUM\\ Campus\\ App/Frameworks",
"$(PROJECT_DIR)/TUM\\ Campus\\ App/Frameworks",
"$(PROJECT_DIR)/TUM\\ Campus\\ App/Frameworks",
);
INFOPLIST_FILE = "TUM Campus App/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.8;
PRODUCT_BUNDLE_IDENTIFIER = de.tum.campusapp;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1200,19 +1161,8 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 43;
DEVELOPMENT_TEAM = LQ83GZ8GRK;
FRAMEWORK_SEARCH_PATHS = (
"$(PROJECT_DIR)/TUM\\ Campus\\ App/Frameworks",
"$(PROJECT_DIR)/TUM\\ Campus\\ App/Frameworks",
"$(PROJECT_DIR)/TUM\\ Campus\\ App/Frameworks",
"$(PROJECT_DIR)/TUM\\ Campus\\ App/Frameworks",
"$(PROJECT_DIR)/TUM\\ Campus\\ App/Frameworks",
);
INFOPLIST_FILE = "TUM Campus App/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.8;
PRODUCT_BUNDLE_IDENTIFIER = de.tum.campusapp;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1231,11 +1181,6 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = LQ83GZ8GRK;
INFOPLIST_FILE = "TUM Campus AppTests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "de.tum.TUM-Campus-AppTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -1251,11 +1196,6 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = LQ83GZ8GRK;
INFOPLIST_FILE = "TUM Campus AppTests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "de.tum.TUM-Campus-AppTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -1271,11 +1211,6 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = LQ83GZ8GRK;
INFOPLIST_FILE = "TUM Campus AppUITests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "de.tum.TUM-Campus-AppUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand All @@ -1292,11 +1227,6 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = LQ83GZ8GRK;
INFOPLIST_FILE = "TUM Campus AppUITests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "de.tum.TUM-Campus-AppUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand Down Expand Up @@ -1409,7 +1339,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 7.1.0;
minimumVersion = 7.3.0;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
16 changes: 8 additions & 8 deletions TUM Campus App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"repositoryURL": "https://github.com/Alamofire/Alamofire.git",
"state": {
"branch": null,
"revision": "9e0328127dfb801cefe8ac53a13c0c90a7770448",
"version": "5.4.0"
"revision": "eaf6e622dd41b07b251d8f01752eab31bc811493",
"version": "5.4.1"
}
},
{
Expand All @@ -33,8 +33,8 @@
"repositoryURL": "https://github.com/richardtop/CalendarKit.git",
"state": {
"branch": null,
"revision": "7746388c9ac27730c5d0f8bdd83b0f2d94a73cdd",
"version": "0.14.2"
"revision": "a2ac448e2a7e661c5ee1c839e1679c3be370019c",
"version": "0.14.6"
}
},
{
Expand All @@ -51,8 +51,8 @@
"repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git",
"state": {
"branch": null,
"revision": "c227152e84ad215eed0285c9df62f39e0406e455",
"version": "7.1.0"
"revision": "c67d97dc802aafe5474042156dce828e1c4145ca",
"version": "7.3.1"
}
},
{
Expand Down Expand Up @@ -114,8 +114,8 @@
"repositoryURL": "https://github.com/google/promises.git",
"state": {
"branch": null,
"revision": "d8accebc8fa32f57196df191e733f946e955c549",
"version": "1.2.11"
"revision": "afa9a1ace74e116848d4f743599ab83e584ff8cb",
"version": "1.2.12"
}
},
{
Expand Down
1 change: 1 addition & 0 deletions TUM Campus App/Calendar/CalendarEventViewModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ final class CalendarEventViewModel: EventDescriptor {
var textColor = UIColor.label
var font = UIFont.boldSystemFont(ofSize: 12)
var userInfo: Any?
var lineBreakMode: NSLineBreakMode? = .byWordWrapping
weak var editedEvent: EventDescriptor? {
didSet {
updateColors()
Expand Down

0 comments on commit dd90b97

Please sign in to comment.