Skip to content

Commit 5ff0d80

Browse files
greenrobot-teamgreenrobot-team
committed
Merge branch '268-fix-broken-build' into 'dev'
Fix broken build See merge request objectbox/objectbox-swift-public!11
2 parents d564c94 + 777314c commit 5ff0d80

File tree

6 files changed

+11
-109
lines changed

6 files changed

+11
-109
lines changed

‎.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ build_project:
1010
- pod repo update
1111
- pod install
1212
- Pods/ObjectBox/setup.rb
13-
- xcodebuild build -workspace NotesExample.xcworkspace -scheme NotesExample-macOS -destination 'platform=OS X,arch=x86_64' -verbose
13+
- xcodebuild clean build -workspace NotesExample.xcworkspace -scheme NotesExample-macOS -destination 'platform=OS X,arch=x86_64'
1414

1515
variables:
1616
GIT_SUBMODULE_STRATEGY: recursive

‎Example/.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
generated/
1+
generated/
2+
3+
# Do not pin pods so CI uses latest
4+
Podfile.lock

‎Example/NotesExample-macOS/StoreHelper.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright © 2018 ObjectBox. All rights reserved.
22

33
import ObjectBox
4+
import Foundation
45

56
extension Store {
67
/// Creates a new ObjectBox.Store in a temporary directory.

‎Example/NotesExample.xcodeproj/project.pbxproj

Lines changed: 3 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -30,12 +30,9 @@
3030
50DC4EA22189A7B200DF7253 /* AuthorsOverviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DC4EA12189A7B200DF7253 /* AuthorsOverviewViewController.swift */; };
3131
50DC4EA42189AB9200DF7253 /* AuthorEditingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DC4EA32189AB9200DF7253 /* AuthorEditingViewController.swift */; };
3232
50DC4EA82189B92400DF7253 /* AuthorCreationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DC4EA72189B92400DF7253 /* AuthorCreationViewController.swift */; };
33-
CB92D5BA675B8E1D824A3EFC /* Pods_NotesExample_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 022B2A063F61ABB1BA3A05B2 /* Pods_NotesExample_iOS.framework */; };
34-
FCB054DFF31FB988F198A270 /* Pods_NotesExample_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F9163496740AA74B1B9F500 /* Pods_NotesExample_macOS.framework */; };
3533
/* End PBXBuildFile section */
3634

3735
/* Begin PBXFileReference section */
38-
022B2A063F61ABB1BA3A05B2 /* Pods_NotesExample_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NotesExample_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3936
5039EC9D2181DA350095204F /* NotesExample-macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "NotesExample-macOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
4037
5039EC9F2181DA350095204F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4138
5039ECA12181DA350095204F /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -64,23 +61,20 @@
6461
50DC4EA32189AB9200DF7253 /* AuthorEditingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthorEditingViewController.swift; sourceTree = "<group>"; };
6562
50DC4EA72189B92400DF7253 /* AuthorCreationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthorCreationViewController.swift; sourceTree = "<group>"; };
6663
5571FBE121A5729000B2073D /* NotesExample-macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "NotesExample-macOS.entitlements"; sourceTree = "<group>"; };
67-
9F9163496740AA74B1B9F500 /* Pods_NotesExample_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NotesExample_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6864
/* End PBXFileReference section */
6965

7066
/* Begin PBXFrameworksBuildPhase section */
7167
5039EC9A2181DA350095204F /* Frameworks */ = {
7268
isa = PBXFrameworksBuildPhase;
7369
buildActionMask = 2147483647;
7470
files = (
75-
FCB054DFF31FB988F198A270 /* Pods_NotesExample_macOS.framework in Frameworks */,
7671
);
7772
runOnlyForDeploymentPostprocessing = 0;
7873
};
7974
5070AAE9218066C0002305F8 /* Frameworks */ = {
8075
isa = PBXFrameworksBuildPhase;
8176
buildActionMask = 2147483647;
8277
files = (
83-
CB92D5BA675B8E1D824A3EFC /* Pods_NotesExample_iOS.framework in Frameworks */,
8478
);
8579
runOnlyForDeploymentPostprocessing = 0;
8680
};
@@ -90,8 +84,6 @@
9084
3DABC3C80306D2BD07D4938C /* Frameworks */ = {
9185
isa = PBXGroup;
9286
children = (
93-
022B2A063F61ABB1BA3A05B2 /* Pods_NotesExample_iOS.framework */,
94-
9F9163496740AA74B1B9F500 /* Pods_NotesExample_macOS.framework */,
9587
);
9688
name = Frameworks;
9789
sourceTree = "<group>";
@@ -170,11 +162,9 @@
170162
isa = PBXNativeTarget;
171163
buildConfigurationList = 5039ECAA2181DA360095204F /* Build configuration list for PBXNativeTarget "NotesExample-macOS" */;
172164
buildPhases = (
173-
31490094811CB81E2781E223 /* [CP] Check Pods Manifest.lock */,
174165
5039EC992181DA350095204F /* Sources */,
175166
5039EC9A2181DA350095204F /* Frameworks */,
176167
5039EC9B2181DA350095204F /* Resources */,
177-
76FA826EA52D0B00B391844E /* [CP] Embed Pods Frameworks */,
178168
);
179169
buildRules = (
180170
);
@@ -189,11 +179,9 @@
189179
isa = PBXNativeTarget;
190180
buildConfigurationList = 5070AB00218066C1002305F8 /* Build configuration list for PBXNativeTarget "NotesExample-iOS" */;
191181
buildPhases = (
192-
9BA7975165E82DD07F3F0ACE /* [CP] Check Pods Manifest.lock */,
193182
5070AAE8218066C0002305F8 /* Sources */,
194183
5070AAE9218066C0002305F8 /* Frameworks */,
195184
5070AAEA218066C0002305F8 /* Resources */,
196-
458D4D90FE540C2DE14D34D0 /* [CP] Embed Pods Frameworks */,
197185
);
198186
buildRules = (
199187
);
@@ -269,97 +257,6 @@
269257
};
270258
/* End PBXResourcesBuildPhase section */
271259

272-
/* Begin PBXShellScriptBuildPhase section */
273-
31490094811CB81E2781E223 /* [CP] Check Pods Manifest.lock */ = {
274-
isa = PBXShellScriptBuildPhase;
275-
buildActionMask = 2147483647;
276-
files = (
277-
);
278-
inputFileListPaths = (
279-
);
280-
inputPaths = (
281-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
282-
"${PODS_ROOT}/Manifest.lock",
283-
);
284-
name = "[CP] Check Pods Manifest.lock";
285-
outputFileListPaths = (
286-
);
287-
outputPaths = (
288-
"$(DERIVED_FILE_DIR)/Pods-NotesExample-macOS-checkManifestLockResult.txt",
289-
);
290-
runOnlyForDeploymentPostprocessing = 0;
291-
shellPath = /bin/sh;
292-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
293-
showEnvVarsInLog = 0;
294-
};
295-
458D4D90FE540C2DE14D34D0 /* [CP] Embed Pods Frameworks */ = {
296-
isa = PBXShellScriptBuildPhase;
297-
buildActionMask = 2147483647;
298-
files = (
299-
);
300-
inputFileListPaths = (
301-
);
302-
inputPaths = (
303-
"${PODS_ROOT}/Target Support Files/Pods-NotesExample-iOS/Pods-NotesExample-iOS-frameworks.sh",
304-
"${PODS_ROOT}/ObjectBox/Carthage/Build/iOS/ObjectBox.framework",
305-
);
306-
name = "[CP] Embed Pods Frameworks";
307-
outputFileListPaths = (
308-
);
309-
outputPaths = (
310-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectBox.framework",
311-
);
312-
runOnlyForDeploymentPostprocessing = 0;
313-
shellPath = /bin/sh;
314-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NotesExample-iOS/Pods-NotesExample-iOS-frameworks.sh\"\n";
315-
showEnvVarsInLog = 0;
316-
};
317-
76FA826EA52D0B00B391844E /* [CP] Embed Pods Frameworks */ = {
318-
isa = PBXShellScriptBuildPhase;
319-
buildActionMask = 2147483647;
320-
files = (
321-
);
322-
inputFileListPaths = (
323-
);
324-
inputPaths = (
325-
"${PODS_ROOT}/Target Support Files/Pods-NotesExample-macOS/Pods-NotesExample-macOS-frameworks.sh",
326-
"${PODS_ROOT}/ObjectBox/Carthage/Build/Mac/ObjectBox.framework",
327-
);
328-
name = "[CP] Embed Pods Frameworks";
329-
outputFileListPaths = (
330-
);
331-
outputPaths = (
332-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectBox.framework",
333-
);
334-
runOnlyForDeploymentPostprocessing = 0;
335-
shellPath = /bin/sh;
336-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NotesExample-macOS/Pods-NotesExample-macOS-frameworks.sh\"\n";
337-
showEnvVarsInLog = 0;
338-
};
339-
9BA7975165E82DD07F3F0ACE /* [CP] Check Pods Manifest.lock */ = {
340-
isa = PBXShellScriptBuildPhase;
341-
buildActionMask = 2147483647;
342-
files = (
343-
);
344-
inputFileListPaths = (
345-
);
346-
inputPaths = (
347-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
348-
"${PODS_ROOT}/Manifest.lock",
349-
);
350-
name = "[CP] Check Pods Manifest.lock";
351-
outputFileListPaths = (
352-
);
353-
outputPaths = (
354-
"$(DERIVED_FILE_DIR)/Pods-NotesExample-iOS-checkManifestLockResult.txt",
355-
);
356-
runOnlyForDeploymentPostprocessing = 0;
357-
shellPath = /bin/sh;
358-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
359-
showEnvVarsInLog = 0;
360-
};
361-
/* End PBXShellScriptBuildPhase section */
362-
363260
/* Begin PBXSourcesBuildPhase section */
364261
5039EC992181DA350095204F /* Sources */ = {
365262
isa = PBXSourcesBuildPhase;
@@ -435,7 +332,7 @@
435332
"$(inherited)",
436333
"@executable_path/../Frameworks",
437334
);
438-
MACOSX_DEPLOYMENT_TARGET = 10.10;
335+
MACOSX_DEPLOYMENT_TARGET = 10.13;
439336
PRODUCT_BUNDLE_IDENTIFIER = "io.objectbox.NotesExample-macOS";
440337
PRODUCT_NAME = "$(TARGET_NAME)";
441338
SDKROOT = macosx;
@@ -455,7 +352,7 @@
455352
"$(inherited)",
456353
"@executable_path/../Frameworks",
457354
);
458-
MACOSX_DEPLOYMENT_TARGET = 10.10;
355+
MACOSX_DEPLOYMENT_TARGET = 10.13;
459356
PRODUCT_BUNDLE_IDENTIFIER = "io.objectbox.NotesExample-macOS";
460357
PRODUCT_NAME = "$(TARGET_NAME)";
461358
SDKROOT = macosx;

‎Example/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ target 'NotesExample-iOS' do
99
end
1010

1111
target 'NotesExample-macOS' do
12-
platform :osx, :deployment_target => '10.10'
12+
platform :osx, :deployment_target => '10.13'
1313
pod 'ObjectBox'
1414
end

‎Example/Shared/Note.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright © 2018 ObjectBox. All rights reserved.
22

33
import ObjectBox
4+
import Foundation
45

56
class Note: Entity {
67
var id: Id = 0 // An ID is required by ObjectBox

0 commit comments

Comments
 (0)