Skip to content

Commit

Permalink
Merge branch 'release/4.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
defagos committed Jul 20, 2021
2 parents 1e63550 + 959a162 commit fe65fea
Show file tree
Hide file tree
Showing 52 changed files with 2,059 additions and 666 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ xcuserdata/
*.xcscmblueprint
xcuserdata

/fastlane/*.xcresult
/fastlane/xcresult
/fastlane/*.xml

/vendor
Expand Down
35 changes: 35 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
inherit_mode:
merge:
- Include

AllCops:
Exclude:
- 'Carthage/**/*'
- 'Demo/Carthage/**/*'
- 'vendor/**/*'
Include:
- 'fastlane/Pluginfile'

# this would cause errors with long lanes
Metrics/BlockLength:
Enabled: true
ExcludedMethods: ['platform', 'for_platform']

# Lane description and gem lines can be long
Layout/LineLength:
Enabled: true
Max: 100
IgnoredPatterns: ['^gem', '^(\s+|)desc', '^(\s+|)UI.']

# They have not to be snake_case
Naming/FileName:
Exclude:
- '**/Appfile'
- '**/Gemfile'
- '**/Pluginfile'
- '**/Fastfile'

# Variables have to be as described in fastlane documentation
Style/RedundantInterpolation:
Exclude:
- '**/Appfile'
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>classNames</key>
<dict>
<key>FontsTestCase</key>
<dict>
<key>testSRGFontPerformance</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.097582</real>
<key>baselineIntegrationDisplayName</key>
<string>Local Baseline</string>
</dict>
</dict>
<key>testUIFontPerformance</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.0043</real>
<key>baselineIntegrationDisplayName</key>
<string>Local Baseline</string>
</dict>
</dict>
</dict>
</dict>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>classNames</key>
<dict>
<key>FontsTestCase</key>
<dict>
<key>testSRGFontPerformance</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.073406</real>
<key>baselineIntegrationDisplayName</key>
<string>Local Baseline</string>
</dict>
</dict>
<key>testUIFontPerformance</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.00409</real>
<key>baselineIntegrationDisplayName</key>
<string>Local Baseline</string>
</dict>
</dict>
</dict>
</dict>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>runDestinationsByUUID</key>
<dict>
<key>44BF8C10-7389-4B85-A6DF-6A9B4C5CB7D8</key>
<dict>
<key>localComputer</key>
<dict>
<key>busSpeedInMHz</key>
<integer>100</integer>
<key>cpuCount</key>
<integer>1</integer>
<key>cpuKind</key>
<string>Quad-Core Intel Core i7</string>
<key>cpuSpeedInMHz</key>
<integer>2700</integer>
<key>logicalCPUCoresPerPackage</key>
<integer>8</integer>
<key>modelCode</key>
<string>MacBookPro13,3</string>
<key>physicalCPUCoresPerPackage</key>
<integer>4</integer>
<key>platformIdentifier</key>
<string>com.apple.platform.macosx</string>
</dict>
<key>targetArchitecture</key>
<string>x86_64</string>
<key>targetDevice</key>
<dict>
<key>modelCode</key>
<string>iPhone11,2</string>
<key>platformIdentifier</key>
<string>com.apple.platform.iphonesimulator</string>
</dict>
</dict>
<key>A2EEEEB8-953A-429D-BDDC-0DE26CB21166</key>
<dict>
<key>localComputer</key>
<dict>
<key>busSpeedInMHz</key>
<integer>100</integer>
<key>cpuCount</key>
<integer>1</integer>
<key>cpuKind</key>
<string>Quad-Core Intel Core i7</string>
<key>cpuSpeedInMHz</key>
<integer>2700</integer>
<key>logicalCPUCoresPerPackage</key>
<integer>8</integer>
<key>modelCode</key>
<string>MacBookPro13,3</string>
<key>physicalCPUCoresPerPackage</key>
<integer>4</integer>
<key>platformIdentifier</key>
<string>com.apple.platform.macosx</string>
</dict>
<key>targetArchitecture</key>
<string>x86_64</string>
<key>targetDevice</key>
<dict>
<key>modelCode</key>
<string>iPhone13,2</string>
<key>platformIdentifier</key>
<string>com.apple.platform.iphonesimulator</string>
</dict>
</dict>
</dict>
</dict>
</plist>
26 changes: 25 additions & 1 deletion .swiftpm/xcode/xcshareddata/xcschemes/SRGAppearance.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1210"
LastUpgradeVersion = "1250"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -62,6 +62,20 @@
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "SRGAppearanceSwift"
BuildableName = "SRGAppearanceSwift"
BlueprintName = "SRGAppearanceSwift"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Expand All @@ -82,6 +96,16 @@
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "SRGAppearanceSwiftTests"
BuildableName = "SRGAppearanceSwiftTests"
BlueprintName = "SRGAppearanceSwiftTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
4 changes: 0 additions & 4 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions Demo/Demo.xcconfig
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Version information
MARKETING_VERSION = 3.0.2
MARKETING_VERSION = 4.0.0

// Deployment targets
IPHONEOS_DEPLOYMENT_TARGET = 9.0
IPHONEOS_DEPLOYMENT_TARGET = 12.0
TVOS_DEPLOYMENT_TARGET = 12.0

// Configuration to have a single target built for all platforms
Expand Down
33 changes: 32 additions & 1 deletion Demo/SRGAppearance-demo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@
6FE08CC31E8A86FB00EC4716 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FE08CBF1E8A86FB00EC4716 /* main.m */; };
6FE08CC61E8A877200EC4716 /* FontsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FE08CC51E8A877200EC4716 /* FontsViewController.m */; };
6FE08CCB1E8A886000EC4716 /* LaunchScreen~ios.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6FE08CCA1E8A886000EC4716 /* LaunchScreen~ios.storyboard */; };
6FE1CB32260B546400E7D399 /* SRGAppearanceSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 6FE1CB31260B546400E7D399 /* SRGAppearanceSwift */; };
6FE48639260B292E00671546 /* PlaygroundViewController~ios.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FE48638260B292E00671546 /* PlaygroundViewController~ios.m */; };
6FE4863E260B298A00671546 /* PlaygroundViewController~ios.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6FE4863D260B298A00671546 /* PlaygroundViewController~ios.storyboard */; };
6FE48649260B515C00671546 /* PlaygroundView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FE48648260B515C00671546 /* PlaygroundView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
6F0EE5822316AE8B00328674 /* Demo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Demo.xcconfig; sourceTree = "<group>"; };
6F0EE5862316B40500328674 /* Resources.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Resources.h; sourceTree = "<group>"; };
6F0EE5872316B40500328674 /* Resources.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Resources.m; sourceTree = "<group>"; };
6F6AE77B24CEE5E600D7C8B6 /* SRGAppearance-demo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "SRGAppearance-demo.entitlements"; sourceTree = "<group>"; };
6F7A3991260B90C6002FA47E /* ObjectiveC-Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ObjectiveC-Bridge.h"; sourceTree = "<group>"; };
6F9453D4223FF5890039974F /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
6FE08C5F1E8A865800EC4716 /* SRGAppearance-demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SRGAppearance-demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
6FE08CBA1E8A86FB00EC4716 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -30,6 +35,10 @@
6FE08CC41E8A877200EC4716 /* FontsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontsViewController.h; sourceTree = "<group>"; };
6FE08CC51E8A877200EC4716 /* FontsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FontsViewController.m; sourceTree = "<group>"; };
6FE08CCA1E8A886000EC4716 /* LaunchScreen~ios.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "LaunchScreen~ios.storyboard"; sourceTree = "<group>"; };
6FE48637260B292E00671546 /* PlaygroundViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlaygroundViewController.h; sourceTree = "<group>"; };
6FE48638260B292E00671546 /* PlaygroundViewController~ios.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "PlaygroundViewController~ios.m"; sourceTree = "<group>"; };
6FE4863D260B298A00671546 /* PlaygroundViewController~ios.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "PlaygroundViewController~ios.storyboard"; sourceTree = "<group>"; };
6FE48648260B515C00671546 /* PlaygroundView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlaygroundView.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -38,6 +47,7 @@
buildActionMask = 2147483647;
files = (
6FC82AD424C5AA4100459101 /* SRGAppearance in Frameworks */,
6FE1CB32260B546400E7D399 /* SRGAppearanceSwift in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -47,6 +57,7 @@
6F0EE5852316B40500328674 /* Helpers */ = {
isa = PBXGroup;
children = (
6F7A3991260B90C6002FA47E /* ObjectiveC-Bridge.h */,
6F0EE5862316B40500328674 /* Resources.h */,
6F0EE5872316B40500328674 /* Resources.m */,
);
Expand Down Expand Up @@ -106,6 +117,10 @@
children = (
6FE08CC41E8A877200EC4716 /* FontsViewController.h */,
6FE08CC51E8A877200EC4716 /* FontsViewController.m */,
6FE48648260B515C00671546 /* PlaygroundView.swift */,
6FE48637260B292E00671546 /* PlaygroundViewController.h */,
6FE48638260B292E00671546 /* PlaygroundViewController~ios.m */,
6FE4863D260B298A00671546 /* PlaygroundViewController~ios.storyboard */,
);
path = Fonts;
sourceTree = "<group>";
Expand Down Expand Up @@ -137,6 +152,7 @@
name = "SRGAppearance-demo";
packageProductDependencies = (
6FC82AD324C5AA4100459101 /* SRGAppearance */,
6FE1CB31260B546400E7D399 /* SRGAppearanceSwift */,
);
productName = "SRGAppearance-demo";
productReference = 6FE08C5F1E8A865800EC4716 /* SRGAppearance-demo.app */;
Expand All @@ -149,12 +165,13 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = SRG;
LastUpgradeCheck = 1210;
LastUpgradeCheck = 1250;
ORGANIZATIONNAME = "SRG SSR";
TargetAttributes = {
6FE08C5E1E8A865800EC4716 = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = VMGRRW6SG7;
LastSwiftMigration = 1240;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -183,6 +200,7 @@
buildActionMask = 2147483647;
files = (
6F9453D5223FF5890039974F /* Images.xcassets in Resources */,
6FE4863E260B298A00671546 /* PlaygroundViewController~ios.storyboard in Resources */,
6FE08CCB1E8A886000EC4716 /* LaunchScreen~ios.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -195,8 +213,10 @@
buildActionMask = 2147483647;
files = (
6FE08CC61E8A877200EC4716 /* FontsViewController.m in Sources */,
6FE48649260B515C00671546 /* PlaygroundView.swift in Sources */,
6F0EE5882316B40500328674 /* Resources.m in Sources */,
6FE08CC31E8A86FB00EC4716 /* main.m in Sources */,
6FE48639260B292E00671546 /* PlaygroundViewController~ios.m in Sources */,
6FE08CC21E8A86FB00EC4716 /* AppDelegate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -325,6 +345,7 @@
baseConfigurationReference = 6F0EE5822316AE8B00328674 /* Demo.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICONS_SOURCE)";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "SRGAppearance-demo.entitlements";
DEVELOPMENT_TEAM = VMGRRW6SG7;
INFOPLIST_FILE = Info.plist;
Expand All @@ -334,6 +355,9 @@
);
SDKROOT = iphoneos;
SUPPORTS_MACCATALYST = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/Sources/Helpers/ObjectiveC-Bridge.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -342,6 +366,7 @@
baseConfigurationReference = 6F0EE5822316AE8B00328674 /* Demo.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICONS_SOURCE)";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "SRGAppearance-demo.entitlements";
DEVELOPMENT_TEAM = VMGRRW6SG7;
INFOPLIST_FILE = Info.plist;
Expand All @@ -351,6 +376,8 @@
);
SDKROOT = iphoneos;
SUPPORTS_MACCATALYST = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/Sources/Helpers/ObjectiveC-Bridge.h";
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down Expand Up @@ -382,6 +409,10 @@
isa = XCSwiftPackageProductDependency;
productName = SRGAppearance;
};
6FE1CB31260B546400E7D399 /* SRGAppearanceSwift */ = {
isa = XCSwiftPackageProductDependency;
productName = SRGAppearanceSwift;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 6FA09D2D1D9E6F8900EDCA64 /* Project object */;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1210"
LastUpgradeVersion = "1250"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Loading

0 comments on commit fe65fea

Please sign in to comment.