Skip to content

Commit

Permalink
update podspec and rename iOS Fabric folder names (microsoft#13)
Browse files Browse the repository at this point in the history
* make sure macOS is folder name changes are reflected in podspec
* rename folders from "OfficeUIFabric" to "FluentUI" for Resource, Test, Demo
* delete old OfficeUIFabric.podspec
* update xcode worspace
* podspec update to new folder location
* update version numbering correctly to 0.0.2
  • Loading branch information
harrieshin authored Apr 15, 2020
1 parent c7469d2 commit 2b9edfa
Show file tree
Hide file tree
Showing 603 changed files with 47 additions and 79 deletions.
10 changes: 5 additions & 5 deletions FluentUI.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FluentUI'
s.version = '0.0.1'
s.version = '0.0.2'
s.summary = 'Fluent UI is a set of reusable UI controls and tools'
s.homepage = "https://www.microsoft.com/design/fluent/#/"
s.license = { :type => 'MIT', :file => 'LICENSE' }
Expand All @@ -9,10 +9,10 @@ Pod::Spec.new do |s|
s.swift_version = "5.0"

s.ios.deployment_target = "11.0"
s.ios.source_files = "ios/OfficeUIFabric/**/*.{swift,h}"
s.ios.resource_bundle = { 'FluentUIResources-ios' => "ios/OfficeUIFabric/**/*.{storyboard,xib,xcassets,strings,stringsdict}" }
s.ios.source_files = "ios/FluentUI/**/*.{swift,h}"
s.ios.resource_bundle = { 'FluentUIResources-ios' => "ios/FluentUI/**/*.{storyboard,xib,xcassets,strings,stringsdict}" }

s.osx.deployment_target = "10.13"
s.osx.source_files = "macos/OfficeUIFabric/**/*.{swift,h}"
s.osx.resource_bundle = { 'FluentUIResources-macos' => "macos/OfficeUIFabric/**/*.{storyboard,xib,xcassets,strings,stringsdict}" }
s.osx.source_files = "macos/FluentUI/**/*.{swift,h}"
s.osx.resource_bundle = { 'FluentUIResources-macos' => "macos/FluentUI/**/*.{storyboard,xib,xcassets,strings,stringsdict}" }
end
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
A5CEC20320E436F10016922A = {
isa = PBXGroup;
children = (
A5CEC20E20E436F10016922A /* OfficeUIFabric.Demo */,
A5CEC20E20E436F10016922A /* FluentUI.Demo */,
A5CEC20D20E436F10016922A /* Products */,
A5CEC22920E44FBF0016922A /* Frameworks */,
6EA5200D30B13B5327B3F995 /* Pods */,
Expand All @@ -218,7 +218,7 @@
name = Products;
sourceTree = "<group>";
};
A5CEC20E20E436F10016922A /* OfficeUIFabric.Demo */ = {
A5CEC20E20E436F10016922A /* FluentUI.Demo */ = {
isa = PBXGroup;
children = (
A5CEC23220E452B80016922A /* Demos */,
Expand All @@ -229,7 +229,7 @@
A5CEC20F20E436F10016922A /* AppDelegate.swift */,
A591A3F320F429EB001ED23B /* Demos.swift */,
);
path = OfficeUIFabric.Demo;
path = FluentUI.Demo;
sourceTree = "<group>";
};
A5CEC22920E44FBF0016922A /* Frameworks */ = {
Expand Down Expand Up @@ -315,7 +315,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0940;
LastUpgradeCheck = 0940;
LastUpgradeCheck = 1120;
ORGANIZATIONNAME = "Microsoft Corporation";
TargetAttributes = {
A5CEC20B20E436F10016922A = {
Expand Down Expand Up @@ -542,6 +542,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_NAME = "";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
Expand Down Expand Up @@ -606,7 +607,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = 9KBH5RKYEW;
INFOPLIST_FILE = OfficeUIFabric.Demo/Info.plist;
INFOPLIST_FILE = FluentUI.Demo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -615,7 +616,7 @@
PRODUCT_NAME = FluentUI.Demo;
PROVISIONING_PROFILE = "4596e7d8-5232-4b9f-82bf-63883e38cd5c";
PROVISIONING_PROFILE_SPECIFIER = "Office Fabric Demo Dogfood Distribution";
SWIFT_OBJC_BRIDGING_HEADER = "OfficeUIFabric.Demo/OfficeUIFabric.Demo-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "FluentUI.Demo/OfficeUIFabric.Demo-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand All @@ -626,6 +627,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_NAME = "";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
Expand Down Expand Up @@ -687,6 +689,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_NAME = "";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
Expand Down Expand Up @@ -747,7 +750,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = UBF8T346G9;
INFOPLIST_FILE = OfficeUIFabric.Demo/Info.plist;
INFOPLIST_FILE = FluentUI.Demo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -756,7 +759,7 @@
PRODUCT_NAME = FluentUI.Demo;
PROVISIONING_PROFILE = "63d62159-2691-4b44-9553-b668cc1746c1";
PROVISIONING_PROFILE_SPECIFIER = "Office UI Fabric Demo Development";
SWIFT_OBJC_BRIDGING_HEADER = "OfficeUIFabric.Demo/OfficeUIFabric.Demo-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "FluentUI.Demo/OfficeUIFabric.Demo-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -773,7 +776,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = UBF8T346G9;
INFOPLIST_FILE = OfficeUIFabric.Demo/Info.plist;
INFOPLIST_FILE = FluentUI.Demo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -782,7 +785,7 @@
PRODUCT_NAME = FluentUI.Demo;
PROVISIONING_PROFILE = "63d62159-2691-4b44-9553-b668cc1746c1";
PROVISIONING_PROFILE_SPECIFIER = "Office UI Fabric Demo Development";
SWIFT_OBJC_BRIDGING_HEADER = "OfficeUIFabric.Demo/OfficeUIFabric.Demo-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "FluentUI.Demo/OfficeUIFabric.Demo-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
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 = "0940"
LastUpgradeVersion = "1120"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
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 = "0940"
LastUpgradeVersion = "1120"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 2b9edfa

Please sign in to comment.