GitHub/XcodeGen
1
0
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2026-03-18 20:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix duplicate uuids

Browse Source
This commit is contained in:
Yonas Kolb
2017-08-02 13:29:45 +02:00
parent 63bdd95a6b
commit b71eb02496
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj
+16 -16
View File
@@ -10,8 +10,8 @@
BF1073850101 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR1332263601 /* AppDelegate.swift */; settings = {}; };
BF1744565901 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR6218091901 /* ViewController.swift */; settings = {}; };
BF2753556301 /* MyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FR2993497801 /* MyFramework.framework */; };
BF2753556301 /* MyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FR2993497801 /* MyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
BF2753556301 /* MyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FR2993497801 /* MyFramework.framework */; };
BF2753556302 = {isa = PBXBuildFile; fileRef = FR2993497801 /* MyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
BF3154421201 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FR5980633301 /* Assets.xcassets */; settings = {}; };
BF3515549501 /* MyFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = FR7740960501 /* MyFramework.h */; settings = {ATTRIBUTES = (Public, ); }; };
BF5986511201 = {isa = PBXBuildFile; fileRef = FR6523263101 /* TestProject.app */; };
@@ -44,7 +44,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
BF2753556301 /* MyFramework.framework in CopyFiles */,
BF2753556302 /* MyFramework.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -53,10 +53,10 @@
/* Begin PBXFileReference section */
FR1332263601 /* AppDelegate.swift */ = {isa = PBXFileReference; path = AppDelegate.swift; sourceTree = "<group>"; };
FR1345298501 /* Info.plist */ = {isa = PBXFileReference; path = Info.plist; sourceTree = "<group>"; };
FR1345298501 /* Info.plist */ = {isa = PBXFileReference; path = Info.plist; sourceTree = "<group>"; };
FR1345298502 /* Info.plist */ = {isa = PBXFileReference; path = Info.plist; sourceTree = "<group>"; };
FR2993497801 /* MyFramework.framework */ = {isa = PBXFileReference; explicitFileType = framework; includeInIndex = 0; path = MyFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FR3676338401 /* Base */ = {isa = PBXFileReference; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
FR3676338401 /* Base */ = {isa = PBXFileReference; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
FR3676338402 /* Base */ = {isa = PBXFileReference; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
FR5980633301 /* Assets.xcassets */ = {isa = PBXFileReference; path = Assets.xcassets; sourceTree = "<group>"; };
FR6218091901 /* ViewController.swift */ = {isa = PBXFileReference; path = ViewController.swift; sourceTree = "<group>"; };
FR6523263101 /* TestProject.app */ = {isa = PBXFileReference; explicitFileType = app; includeInIndex = 0; path = TestProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -87,7 +87,7 @@
isa = PBXGroup;
children = (
FR7078510801 /* FrameworkFile.swift */,
FR1345298501 /* Info.plist */,
FR1345298502 /* Info.plist */,
FR7740960501 /* MyFramework.h */,
);
name = MyFramework;
@@ -156,7 +156,7 @@
HBP299349701 /* Headers */,
FBP299349701 /* Frameworks */,
CFBP29934901 /* Copy Files */,
SSBP25860701 /* Run Script */,
SSBP25860702 /* Run Script */,
);
buildRules = (
);
@@ -241,7 +241,7 @@
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
};
SSBP25860701 /* Run Script */ = {
SSBP25860702 /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -289,7 +289,7 @@
VG1473702401 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
FR3676338401 /* Base */,
FR3676338402 /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
@@ -356,7 +356,7 @@
};
name = Debug;
};
XCBC47994501 /* Debug */ = {
XCBC47994502 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -369,7 +369,7 @@
};
name = Debug;
};
XCBC47994501 /* Debug */ = {
XCBC47994503 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -430,7 +430,7 @@
};
name = Release;
};
XCBC88111401 /* Release */ = {
XCBC88111402 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -443,7 +443,7 @@
};
name = Release;
};
XCBC88111401 /* Release */ = {
XCBC88111403 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -466,8 +466,8 @@
XCCL29934901 /* Build configuration list for PBXNativeTarget "MyFramework" */ = {
isa = XCConfigurationList;
buildConfigurations = (
XCBC88111401 /* Release */,
XCBC47994501 /* Debug */,
XCBC88111403 /* Release */,
XCBC47994503 /* Debug */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = "";
@@ -475,8 +475,8 @@
XCCL65232601 /* Build configuration list for PBXNativeTarget "TestProject" */ = {
isa = XCConfigurationList;
buildConfigurations = (
XCBC88111401 /* Release */,
XCBC47994501 /* Debug */,
XCBC47994502 /* Debug */,
XCBC88111402 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = "";
Sources/XcodeGenKit/PBXProjGenerator.swift
+1
View File
@@ -52,6 +52,7 @@ public class PBXProjGenerator {
counter += 1
uuid = "\(classAcronym)\(stringID)\(String(format: "%02d", counter))"
} while (uuids.contains(uuid))
uuids.insert(uuid)
return uuid
}