Skip to content

Commit 4b800a8

Browse files
maximkhatskevichmaximkhatskevich
committed
Merge branch 'release/1.3.2'
2 parents 414c495 + d538da8 commit 4b800a8

23 files changed

+35
-35
lines changed

‎Example/Spec.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import MKHProjGen
1+
import XCEProjectGenerator
22

33
//===
44

Info/MKHProjGen.plist renamed to Info/Fwk.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.3.1</string>
18+
<string>1.3.2</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSHumanReadableCopyright</key>

‎Launcher/main.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import Foundation
1010

11-
import MKHProjGen
11+
import XCEProjectGenerator
1212

1313
//===
1414

MKHProjGen.xcodeproj/project.pbxproj renamed to ProjectGenerator.xcodeproj/project.pbxproj

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
943179991E7D82D500F3796D /* Project.Struct.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943179981E7D820C00F3796D /* Project.Struct.swift */; };
1111
943C0C291E7B14CB00C8DF86 /* MKHProjGen.h in Headers */ = {isa = PBXBuildFile; fileRef = 943C0C141E7B141400C8DF86 /* MKHProjGen.h */; settings = {ATTRIBUTES = (Public, ); }; };
1212
943C0C4C1E7B198D00C8DF86 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943C0C4A1E7B198D00C8DF86 /* main.swift */; };
13-
949521F41E7B2A2C00812390 /* MKHProjGen.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 943C0C021E7B134500C8DF86 /* MKHProjGen.framework */; };
13+
949521F41E7B2A2C00812390 /* XCEProjectGenerator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 943C0C021E7B134500C8DF86 /* XCEProjectGenerator.framework */; };
1414
9495220B1E7BF62A00812390 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943C0C4A1E7B198D00C8DF86 /* main.swift */; };
15-
9495220D1E7BF62A00812390 /* MKHProjGen.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 943C0C021E7B134500C8DF86 /* MKHProjGen.framework */; };
15+
9495220D1E7BF62A00812390 /* XCEProjectGenerator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 943C0C021E7B134500C8DF86 /* XCEProjectGenerator.framework */; };
1616
949522131E7BF66C00812390 /* Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943C0C481E7B198D00C8DF86 /* Spec.swift */; };
1717
949BB45C1E87E43E008F599B /* Device.swift in Sources */ = {isa = PBXBuildFile; fileRef = 949BB4491E87E43E008F599B /* Device.swift */; };
1818
949BB45D1E87E43E008F599B /* Manager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 949BB44A1E87E43E008F599B /* Manager.swift */; };
@@ -73,7 +73,7 @@
7373

7474
/* Begin PBXFileReference section */
7575
943179981E7D820C00F3796D /* Project.Struct.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Project.Struct.swift; path = ../../../../Project.Struct.swift; sourceTree = "<group>"; };
76-
943C0C021E7B134500C8DF86 /* MKHProjGen.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MKHProjGen.framework; sourceTree = BUILT_PRODUCTS_DIR; };
76+
943C0C021E7B134500C8DF86 /* XCEProjectGenerator.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = XCEProjectGenerator.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7777
943C0C141E7B141400C8DF86 /* MKHProjGen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MKHProjGen.h; sourceTree = "<group>"; };
7878
943C0C401E7B196200C8DF86 /* Launcher */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Launcher; sourceTree = BUILT_PRODUCTS_DIR; };
7979
943C0C481E7B198D00C8DF86 /* Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Spec.swift; sourceTree = "<group>"; };
@@ -110,15 +110,15 @@
110110
isa = PBXFrameworksBuildPhase;
111111
buildActionMask = 2147483647;
112112
files = (
113-
949521F41E7B2A2C00812390 /* MKHProjGen.framework in Frameworks */,
113+
949521F41E7B2A2C00812390 /* XCEProjectGenerator.framework in Frameworks */,
114114
);
115115
runOnlyForDeploymentPostprocessing = 0;
116116
};
117117
9495220C1E7BF62A00812390 /* Frameworks */ = {
118118
isa = PBXFrameworksBuildPhase;
119119
buildActionMask = 2147483647;
120120
files = (
121-
9495220D1E7BF62A00812390 /* MKHProjGen.framework in Frameworks */,
121+
9495220D1E7BF62A00812390 /* XCEProjectGenerator.framework in Frameworks */,
122122
);
123123
runOnlyForDeploymentPostprocessing = 0;
124124
};
@@ -130,7 +130,7 @@
130130
children = (
131131
943C0C471E7B198D00C8DF86 /* Example */,
132132
943C0C491E7B198D00C8DF86 /* Launcher */,
133-
949BB4481E87E43E008F599B /* Lib */,
133+
949BB4481E87E43E008F599B /* Src */,
134134
943C0C131E7B141400C8DF86 /* Src-Extra */,
135135
943C0C031E7B134500C8DF86 /* Products */,
136136
);
@@ -139,7 +139,7 @@
139139
943C0C031E7B134500C8DF86 /* Products */ = {
140140
isa = PBXGroup;
141141
children = (
142-
943C0C021E7B134500C8DF86 /* MKHProjGen.framework */,
142+
943C0C021E7B134500C8DF86 /* XCEProjectGenerator.framework */,
143143
943C0C401E7B196200C8DF86 /* Launcher */,
144144
949522121E7BF62A00812390 /* Example */,
145145
);
@@ -171,7 +171,7 @@
171171
path = Launcher;
172172
sourceTree = "<group>";
173173
};
174-
949BB4481E87E43E008F599B /* Lib */ = {
174+
949BB4481E87E43E008F599B /* Src */ = {
175175
isa = PBXGroup;
176176
children = (
177177
949BB4491E87E43E008F599B /* Device.swift */,
@@ -182,7 +182,7 @@
182182
949BB4531E87E43E008F599B /* Spec */,
183183
949BB4561E87E43E008F599B /* Target */,
184184
);
185-
path = Lib;
185+
path = Src;
186186
sourceTree = "<group>";
187187
};
188188
949BB44D1E87E43E008F599B /* Project */ = {
@@ -233,9 +233,9 @@
233233
/* End PBXHeadersBuildPhase section */
234234

235235
/* Begin PBXNativeTarget section */
236-
943C0C011E7B134500C8DF86 /* MKHProjGen */ = {
236+
943C0C011E7B134500C8DF86 /* ProjectGenerator */ = {
237237
isa = PBXNativeTarget;
238-
buildConfigurationList = 943C0C0A1E7B134500C8DF86 /* Build configuration list for PBXNativeTarget "MKHProjGen" */;
238+
buildConfigurationList = 943C0C0A1E7B134500C8DF86 /* Build configuration list for PBXNativeTarget "ProjectGenerator" */;
239239
buildPhases = (
240240
943C0BFD1E7B134500C8DF86 /* Sources */,
241241
943C0BFE1E7B134500C8DF86 /* Frameworks */,
@@ -247,9 +247,9 @@
247247
);
248248
dependencies = (
249249
);
250-
name = MKHProjGen;
250+
name = ProjectGenerator;
251251
productName = MKHProjGen;
252-
productReference = 943C0C021E7B134500C8DF86 /* MKHProjGen.framework */;
252+
productReference = 943C0C021E7B134500C8DF86 /* XCEProjectGenerator.framework */;
253253
productType = "com.apple.product-type.framework";
254254
};
255255
943C0C3F1E7B196200C8DF86 /* Launcher */ = {
@@ -313,7 +313,7 @@
313313
};
314314
};
315315
};
316-
buildConfigurationList = 943C0BFC1E7B134500C8DF86 /* Build configuration list for PBXProject "MKHProjGen" */;
316+
buildConfigurationList = 943C0BFC1E7B134500C8DF86 /* Build configuration list for PBXProject "ProjectGenerator" */;
317317
compatibilityVersion = "Xcode 3.2";
318318
developmentRegion = English;
319319
hasScannedForEncodings = 0;
@@ -325,7 +325,7 @@
325325
projectDirPath = "";
326326
projectRoot = "";
327327
targets = (
328-
943C0C011E7B134500C8DF86 /* MKHProjGen */,
328+
943C0C011E7B134500C8DF86 /* ProjectGenerator */,
329329
943C0C3F1E7B196200C8DF86 /* Launcher */,
330330
949522071E7BF62A00812390 /* Example */,
331331
);
@@ -409,12 +409,12 @@
409409
/* Begin PBXTargetDependency section */
410410
949521F31E7B2A2600812390 /* PBXTargetDependency */ = {
411411
isa = PBXTargetDependency;
412-
target = 943C0C011E7B134500C8DF86 /* MKHProjGen */;
412+
target = 943C0C011E7B134500C8DF86 /* ProjectGenerator */;
413413
targetProxy = 949521F21E7B2A2600812390 /* PBXContainerItemProxy */;
414414
};
415415
949522081E7BF62A00812390 /* PBXTargetDependency */ = {
416416
isa = PBXTargetDependency;
417-
target = 943C0C011E7B134500C8DF86 /* MKHProjGen */;
417+
target = 943C0C011E7B134500C8DF86 /* ProjectGenerator */;
418418
targetProxy = 949522091E7BF62A00812390 /* PBXContainerItemProxy */;
419419
};
420420
/* End PBXTargetDependency section */
@@ -443,7 +443,7 @@
443443
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
444444
CODE_SIGN_IDENTITY = "-";
445445
COPY_PHASE_STRIP = NO;
446-
CURRENT_PROJECT_VERSION = 11;
446+
CURRENT_PROJECT_VERSION = 12;
447447
DEBUG_INFORMATION_FORMAT = dwarf;
448448
ENABLE_STRICT_OBJC_MSGSEND = YES;
449449
ENABLE_TESTABILITY = YES;
@@ -495,7 +495,7 @@
495495
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
496496
CODE_SIGN_IDENTITY = "-";
497497
COPY_PHASE_STRIP = NO;
498-
CURRENT_PROJECT_VERSION = 11;
498+
CURRENT_PROJECT_VERSION = 12;
499499
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
500500
ENABLE_NS_ASSERTIONS = NO;
501501
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -527,11 +527,11 @@
527527
DYLIB_CURRENT_VERSION = 1;
528528
DYLIB_INSTALL_NAME_BASE = "@rpath";
529529
FRAMEWORK_VERSION = A;
530-
INFOPLIST_FILE = Info/MKHProjGen.plist;
530+
INFOPLIST_FILE = Info/Fwk.plist;
531531
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
532532
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks @executable_path/Frameworks";
533-
PRODUCT_BUNDLE_IDENTIFIER = maxim.khatskevich.MKHProjGen;
534-
PRODUCT_NAME = "$(TARGET_NAME)";
533+
PRODUCT_BUNDLE_IDENTIFIER = io.XCEssentials.ProjectGenerator;
534+
PRODUCT_NAME = XCEProjectGenerator;
535535
SKIP_INSTALL = YES;
536536
SWIFT_VERSION = 3.0;
537537
};
@@ -548,11 +548,11 @@
548548
DYLIB_CURRENT_VERSION = 1;
549549
DYLIB_INSTALL_NAME_BASE = "@rpath";
550550
FRAMEWORK_VERSION = A;
551-
INFOPLIST_FILE = Info/MKHProjGen.plist;
551+
INFOPLIST_FILE = Info/Fwk.plist;
552552
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
553553
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks @executable_path/Frameworks";
554-
PRODUCT_BUNDLE_IDENTIFIER = maxim.khatskevich.MKHProjGen;
555-
PRODUCT_NAME = "$(TARGET_NAME)";
554+
PRODUCT_BUNDLE_IDENTIFIER = io.XCEssentials.ProjectGenerator;
555+
PRODUCT_NAME = XCEProjectGenerator;
556556
SKIP_INSTALL = YES;
557557
SWIFT_VERSION = 3.0;
558558
};
@@ -637,7 +637,7 @@
637637
/* End XCBuildConfiguration section */
638638

639639
/* Begin XCConfigurationList section */
640-
943C0BFC1E7B134500C8DF86 /* Build configuration list for PBXProject "MKHProjGen" */ = {
640+
943C0BFC1E7B134500C8DF86 /* Build configuration list for PBXProject "ProjectGenerator" */ = {
641641
isa = XCConfigurationList;
642642
buildConfigurations = (
643643
943C0C081E7B134500C8DF86 /* Debug */,
@@ -646,7 +646,7 @@
646646
defaultConfigurationIsVisible = 0;
647647
defaultConfigurationName = Release;
648648
};
649-
943C0C0A1E7B134500C8DF86 /* Build configuration list for PBXNativeTarget "MKHProjGen" */ = {
649+
943C0C0A1E7B134500C8DF86 /* Build configuration list for PBXNativeTarget "ProjectGenerator" */ = {
650650
isa = XCConfigurationList;
651651
buildConfigurations = (
652652
943C0C0B1E7B134500C8DF86 /* Debug */,

MKHProjGen.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to ProjectGenerator.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MKHProjGen.xcodeproj/xcshareddata/xcschemes/Launcher.xcscheme renamed to ProjectGenerator.xcodeproj/xcshareddata/xcschemes/Launcher.xcscheme

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
BlueprintIdentifier = "943C0C3F1E7B196200C8DF86"
1818
BuildableName = "Launcher"
1919
BlueprintName = "Launcher"
20-
ReferencedContainer = "container:MKHProjGen.xcodeproj">
20+
ReferencedContainer = "container:ProjectGenerator.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -35,7 +35,7 @@
3535
BlueprintIdentifier = "943C0C3F1E7B196200C8DF86"
3636
BuildableName = "Launcher"
3737
BlueprintName = "Launcher"
38-
ReferencedContainer = "container:MKHProjGen.xcodeproj">
38+
ReferencedContainer = "container:ProjectGenerator.xcodeproj">
3939
</BuildableReference>
4040
</MacroExpansion>
4141
<AdditionalOptions>
@@ -58,7 +58,7 @@
5858
BlueprintIdentifier = "943C0C3F1E7B196200C8DF86"
5959
BuildableName = "Launcher"
6060
BlueprintName = "Launcher"
61-
ReferencedContainer = "container:MKHProjGen.xcodeproj">
61+
ReferencedContainer = "container:ProjectGenerator.xcodeproj">
6262
</BuildableReference>
6363
</BuildableProductRunnable>
6464
<CommandLineArguments>
@@ -83,7 +83,7 @@
8383
BlueprintIdentifier = "943C0C3F1E7B196200C8DF86"
8484
BuildableName = "Launcher"
8585
BlueprintName = "Launcher"
86-
ReferencedContainer = "container:MKHProjGen.xcodeproj">
86+
ReferencedContainer = "container:ProjectGenerator.xcodeproj">
8787
</BuildableReference>
8888
</BuildableProductRunnable>
8989
</ProfileAction>

Lib/Device.swift renamed to Src/Device.swift

File renamed without changes.

Lib/Manager.swift renamed to Src/Manager.swift

File renamed without changes.

Lib/Misc.swift renamed to Src/Misc.swift

File renamed without changes.

Lib/Platform.swift renamed to Src/Platform.swift

File renamed without changes.

0 commit comments

Comments
 (0)