Skip to content

Commit

Permalink
Merge pull request #45 from rockbruno/xcode12
Browse files Browse the repository at this point in the history
Support Xcode 12
  • Loading branch information
rockbruno authored Sep 23, 2020
2 parents ebe496d + 2719d85 commit 07811fa
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 82 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
- name: Build
run: make build
env:
DEVELOPER_DIR: /Applications/Xcode_11.4.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
- name: Run tests
run: swift test
- name: Check the example project
run: cd ./ExampleProject && make swiftinfo
env:
DEVELOPER_DIR: /Applications/Xcode_11.4.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
- name: Package
run: make package
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.DS_Store
/.swiftpm
SwiftInfo-bin/
/.build
/.builda
/Packages
Expand Down
9 changes: 7 additions & 2 deletions ExampleProject/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
.PHONY : swiftinfo

swiftinfo:
cd ../ && make build
cd ../ && make package
rm -rf SwiftInfo-bin
mkdir SwiftInfo-bin
cp ../.build/release/_PRODUCT/swiftinfo.zip ./SwiftInfo-bin
cd ./SwiftInfo-bin && unzip swiftinfo.zip
bundle install
bundle exec pod install
bundle exec fastlane beta
./Pods/SwiftInfo/bin/swiftinfo
./SwiftInfo-bin/bin/swiftinfo
echo "-------"
echo "This bash script runs SwiftInfo outside of fastlane so you can see the output, but check out the Fastfile to see how you could use this in a real project."
7 changes: 0 additions & 7 deletions ExampleProject/Podfile

This file was deleted.

16 changes: 0 additions & 16 deletions ExampleProject/Podfile.lock

This file was deleted.

52 changes: 0 additions & 52 deletions ExampleProject/SwiftInfoExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
AE131A0552B013281F8AE2C9 /* Pods_SwiftInfoExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCD82833469C1AD6DC48FAE5 /* Pods_SwiftInfoExample.framework */; };
FDCD0CC722787F1D0090CB88 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDCD0CC622787F1D0090CB88 /* AppDelegate.swift */; };
FDCD0CC922787F1D0090CB88 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDCD0CC822787F1D0090CB88 /* ViewController.swift */; };
FDCD0CCC22787F1D0090CB88 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FDCD0CCA22787F1D0090CB88 /* Main.storyboard */; };
Expand All @@ -27,9 +26,6 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
18908AECFBACDC25A14AA8F2 /* Pods-SwiftInfoExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftInfoExample.debug.xcconfig"; path = "Target Support Files/Pods-SwiftInfoExample/Pods-SwiftInfoExample.debug.xcconfig"; sourceTree = "<group>"; };
8C5F06B77D094C51734DC166 /* Pods-SwiftInfoExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftInfoExample.release.xcconfig"; path = "Target Support Files/Pods-SwiftInfoExample/Pods-SwiftInfoExample.release.xcconfig"; sourceTree = "<group>"; };
FCD82833469C1AD6DC48FAE5 /* Pods_SwiftInfoExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SwiftInfoExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FDCD0CC322787F1D0090CB88 /* SwiftInfoExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftInfoExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
FDCD0CC622787F1D0090CB88 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
FDCD0CC822787F1D0090CB88 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand All @@ -47,7 +43,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
AE131A0552B013281F8AE2C9 /* Pods_SwiftInfoExample.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -61,31 +56,12 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
27D765D2D78F11959C7AD55B /* Frameworks */ = {
isa = PBXGroup;
children = (
FCD82833469C1AD6DC48FAE5 /* Pods_SwiftInfoExample.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
C19DF21F8512F06FBF0A7A14 /* Pods */ = {
isa = PBXGroup;
children = (
18908AECFBACDC25A14AA8F2 /* Pods-SwiftInfoExample.debug.xcconfig */,
8C5F06B77D094C51734DC166 /* Pods-SwiftInfoExample.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
};
FDCD0CBA22787F1C0090CB88 = {
isa = PBXGroup;
children = (
FDCD0CC522787F1D0090CB88 /* SwiftInfoExample */,
FDCD0CDA22787F1E0090CB88 /* SwiftInfoExampleTests */,
FDCD0CC422787F1D0090CB88 /* Products */,
C19DF21F8512F06FBF0A7A14 /* Pods */,
27D765D2D78F11959C7AD55B /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -127,7 +103,6 @@
isa = PBXNativeTarget;
buildConfigurationList = FDCD0CE022787F1E0090CB88 /* Build configuration list for PBXNativeTarget "SwiftInfoExample" */;
buildPhases = (
405B8DB0A45B4134F91983C4 /* [CP] Check Pods Manifest.lock */,
FDCD0CBF22787F1C0090CB88 /* Sources */,
FDCD0CC022787F1C0090CB88 /* Frameworks */,
FDCD0CC122787F1C0090CB88 /* Resources */,
Expand Down Expand Up @@ -217,31 +192,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
405B8DB0A45B4134F91983C4 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-SwiftInfoExample-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
FDCD0CBF22787F1C0090CB88 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -410,7 +360,6 @@
};
FDCD0CE122787F1E0090CB88 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 18908AECFBACDC25A14AA8F2 /* Pods-SwiftInfoExample.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
Expand All @@ -429,7 +378,6 @@
};
FDCD0CE222787F1E0090CB88 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 8C5F06B77D094C51734DC166 /* Pods-SwiftInfoExample.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:4.2
// swift-tools-version:5.0
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftInfo/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public struct Main {
static func run() {
let fileUtils = FileUtils()
let toolchainPath = getToolchainPath()
log("SwiftInfo 2.3.11")
log("SwiftInfo 2.3.12")
if ProcessInfo.processInfo.arguments.contains("-version") {
exit(0)
}
Expand Down
2 changes: 1 addition & 1 deletion SwiftInfo.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = 'SwiftInfo'
s.module_name = 'SwiftInfo'
s.version = '2.3.11'
s.version = '2.3.12'
s.license = { type: 'MIT', file: 'LICENSE' }
s.summary = 'Extract and analyze the evolution of an iOS app\'s code.'
s.homepage = 'https://github.com/rockbruno/SwiftInfo'
Expand Down

0 comments on commit 07811fa

Please sign in to comment.