Skip to content
This repository was archived by the owner on Sep 19, 2024. It is now read-only.

Add basic watchOS support #28

Merged
merged 5 commits into from
Jun 10, 2019
Merged

Add basic watchOS support #28

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62cc40c
Add basic watchOS support
lammertw Aug 28, 2018
d6eba6f
Fix code for different platforms
lammertw Jan 14, 2019
c6ba2bc
Remove Rswift-watchOS target files, use shared Info.plist file
tomlokhorst Jan 14, 2019
fc22d31
Merge branch 'master' into lammertw-watchos
tomlokhorst Jun 10, 2019
997b6e5
Update to Swift 5
tomlokhorst Jun 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add basic watchOS support
  • Loading branch information
@lammertw
lammertw committed Aug 28, 2018
commit 62cc40c46017de6ea1a640b527aae992505ebef4
5 changes: 4 additions & 1 deletion R.swift.Library.podspec
View file
Original file line number Diff line number Diff line change
@@ -19,9 +19,12 @@ Pod::Spec.new do |spec|
spec.source = { :git => "https://github.com/mac-cain13/R.swift.Library.git", :tag => "v#{spec.version}" }

spec.ios.deployment_target = '8.0'
spec.ios.source_files = "Library/**/*.swift"
spec.tvos.deployment_target = '9.0'
spec.tvos.source_files = "Library/**/*.swift"
spec.watchos.deployment_target = '2.2'
spec.watchos.source_files = ["Library/Core/*.swift", "Library/Foundation/*.swift"]

spec.module_name = "Rswift"
spec.source_files = "Library/**/*.swift"

end
174 changes: 174 additions & 0 deletions R.swift.Library.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,24 @@
objects = {

/* Begin PBXBuildFile section */
2F5FBC4421355A1400A83A69 /* Rswift_watchOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F5FBC4221355A1400A83A69 /* Rswift_watchOS.h */; settings = {ATTRIBUTES = (Public, ); }; };
2F5FBC4821355AC400A83A69 /* ColorResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22D43661C95EEA100692FFF /* ColorResource.swift */; };
2F5FBC4A21355ADB00A83A69 /* Bundle+FileResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D56DC7721C42B65C00623437 /* Bundle+FileResource.swift */; };
2F5FBC4B21355ADB00A83A69 /* Data+FileResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = E20F34A61C92B44100338F81 /* Data+FileResource.swift */; };
2F5FBC4C21355ADF00A83A69 /* FileResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5E435AC1C3D00770091090C /* FileResource.swift */; };
2F5FBC4D21355ADF00A83A69 /* FontResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57E1EB21C3D762300DDA68F /* FontResource.swift */; };
2F5FBC4E21355ADF00A83A69 /* Identifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = D543F9BA1C1497EB00D16A0C /* Identifier.swift */; };
2F5FBC4F21355ADF00A83A69 /* ImageResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D553F5841C44157000885232 /* ImageResource.swift */; };
2F5FBC5021355ADF00A83A69 /* NibResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D543F9C01C14984300D16A0C /* NibResource.swift */; };
2F5FBC5121355ADF00A83A69 /* ReuseIdentifierProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D543F9BC1C14980600D16A0C /* ReuseIdentifierProtocol.swift */; };
2F5FBC5221355ADF00A83A69 /* StoryboardResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57E1EB61C3E482A00DDA68F /* StoryboardResource.swift */; };
2F5FBC5321355ADF00A83A69 /* StoryboardSegueIdentifierProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D543F9BE1C14983100D16A0C /* StoryboardSegueIdentifierProtocol.swift */; };
2F5FBC5421355ADF00A83A69 /* StoryboardViewControllerResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D51335261C959DF20014C9D4 /* StoryboardViewControllerResource.swift */; };
2F5FBC5521355ADF00A83A69 /* StringResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = E250BE961CCBF60300CC71DE /* StringResource.swift */; };
2F5FBC5621355ADF00A83A69 /* Validatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D53F19231C229D7200AE2FAD /* Validatable.swift */; };
2F5FBC5821355B0200A83A69 /* UIColor+ColorResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2CA68EE1EE75992009C4DB4 /* UIColor+ColorResource.swift */; };
2F5FBC5921355B0200A83A69 /* UIFont+FontResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57E1EB41C3D774000DDA68F /* UIFont+FontResource.swift */; };
2F5FBC5A21355B0200A83A69 /* UIImage+ImageResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D553F5861C44170E00885232 /* UIImage+ImageResource.swift */; };
806E699C1C42BD9C00DE3A8B /* Rswift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 806E69921C42BD9C00DE3A8B /* Rswift.framework */; };
806E69A91C42BDDA00DE3A8B /* FileResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5E435AC1C3D00770091090C /* FileResource.swift */; };
806E69AA1C42BDDA00DE3A8B /* FontResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57E1EB21C3D762300DDA68F /* FontResource.swift */; };
@@ -87,6 +105,9 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
2F5FBC4021355A1400A83A69 /* Rswift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Rswift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2F5FBC4221355A1400A83A69 /* Rswift_watchOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Rswift_watchOS.h; sourceTree = "<group>"; };
2F5FBC4321355A1400A83A69 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
806E69921C42BD9C00DE3A8B /* Rswift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Rswift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
806E699B1C42BD9C00DE3A8B /* RswiftTests-tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "RswiftTests-tvOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
D51335261C959DF20014C9D4 /* StoryboardViewControllerResource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryboardViewControllerResource.swift; sourceTree = "<group>"; };
@@ -125,6 +146,13 @@
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
2F5FBC3D21355A1400A83A69 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
806E698E1C42BD9C00DE3A8B /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -158,6 +186,15 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
2F5FBC4121355A1400A83A69 /* Rswift-watchOS */ = {
isa = PBXGroup;
children = (
2F5FBC4221355A1400A83A69 /* Rswift_watchOS.h */,
2F5FBC4321355A1400A83A69 /* Info.plist */,
);
path = "Rswift-watchOS";
sourceTree = "<group>";
};
D543F9C21C14987000D16A0C /* UIKit */ = {
isa = PBXGroup;
children = (
@@ -211,6 +248,7 @@
children = (
D59246501C117A55007F94C7 /* Library */,
D592465C1C117A55007F94C7 /* LibraryTests */,
2F5FBC4121355A1400A83A69 /* Rswift-watchOS */,
D592464F1C117A55007F94C7 /* Products */,
);
indentWidth = 2;
@@ -225,6 +263,7 @@
D59246581C117A55007F94C7 /* RswiftTests-iOS.xctest */,
806E69921C42BD9C00DE3A8B /* Rswift.framework */,
806E699B1C42BD9C00DE3A8B /* RswiftTests-tvOS.xctest */,
2F5FBC4021355A1400A83A69 /* Rswift.framework */,
);
name = Products;
sourceTree = "<group>";
@@ -253,6 +292,14 @@
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
2F5FBC3B21355A1400A83A69 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
2F5FBC4421355A1400A83A69 /* Rswift_watchOS.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
806E698F1C42BD9C00DE3A8B /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@@ -272,6 +319,24 @@
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
2F5FBC3F21355A1400A83A69 /* Rswift-watchOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 2F5FBC4721355A1400A83A69 /* Build configuration list for PBXNativeTarget "Rswift-watchOS" */;
buildPhases = (
2F5FBC3B21355A1400A83A69 /* Headers */,
2F5FBC3C21355A1400A83A69 /* Sources */,
2F5FBC3D21355A1400A83A69 /* Frameworks */,
2F5FBC3E21355A1400A83A69 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = "Rswift-watchOS";
productName = "Rswift-watchOS";
productReference = 2F5FBC4021355A1400A83A69 /* Rswift.framework */;
productType = "com.apple.product-type.framework";
};
806E69911C42BD9C00DE3A8B /* Rswift-tvOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 806E69A31C42BD9C00DE3A8B /* Build configuration list for PBXNativeTarget "Rswift-tvOS" */;
@@ -354,6 +419,10 @@
LastUpgradeCheck = 1000;
ORGANIZATIONNAME = "Mathijs Kadijk";
TargetAttributes = {
2F5FBC3F21355A1400A83A69 = {
CreatedOnToolsVersion = 10.0;
ProvisioningStyle = Automatic;
};
806E69911C42BD9C00DE3A8B = {
CreatedOnToolsVersion = 7.2;
LastSwiftMigration = 0900;
@@ -388,11 +457,19 @@
D59246571C117A55007F94C7 /* RswiftTests-iOS */,
806E69911C42BD9C00DE3A8B /* Rswift-tvOS */,
806E699A1C42BD9C00DE3A8B /* RswiftTests-tvOS */,
2F5FBC3F21355A1400A83A69 /* Rswift-watchOS */,
);
};
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
2F5FBC3E21355A1400A83A69 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
806E69901C42BD9C00DE3A8B /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@@ -424,6 +501,30 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
2F5FBC3C21355A1400A83A69 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2F5FBC4F21355ADF00A83A69 /* ImageResource.swift in Sources */,
2F5FBC5421355ADF00A83A69 /* StoryboardViewControllerResource.swift in Sources */,
2F5FBC4D21355ADF00A83A69 /* FontResource.swift in Sources */,
2F5FBC5A21355B0200A83A69 /* UIImage+ImageResource.swift in Sources */,
2F5FBC5921355B0200A83A69 /* UIFont+FontResource.swift in Sources */,
2F5FBC4821355AC400A83A69 /* ColorResource.swift in Sources */,
2F5FBC4C21355ADF00A83A69 /* FileResource.swift in Sources */,
2F5FBC5221355ADF00A83A69 /* StoryboardResource.swift in Sources */,
2F5FBC5521355ADF00A83A69 /* StringResource.swift in Sources */,
2F5FBC4B21355ADB00A83A69 /* Data+FileResource.swift in Sources */,
2F5FBC5021355ADF00A83A69 /* NibResource.swift in Sources */,
2F5FBC5321355ADF00A83A69 /* StoryboardSegueIdentifierProtocol.swift in Sources */,
2F5FBC4E21355ADF00A83A69 /* Identifier.swift in Sources */,
2F5FBC4A21355ADB00A83A69 /* Bundle+FileResource.swift in Sources */,
2F5FBC5821355B0200A83A69 /* UIColor+ColorResource.swift in Sources */,
2F5FBC5121355ADF00A83A69 /* ReuseIdentifierProtocol.swift in Sources */,
2F5FBC5621355ADF00A83A69 /* Validatable.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
806E698D1C42BD9C00DE3A8B /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -524,6 +625,70 @@
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
2F5FBC4521355A1400A83A69 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "Rswift-watchOS/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = nl.mathijskadijk.rswift.library;
PRODUCT_NAME = Rswift;
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2;
};
name = Debug;
};
2F5FBC4621355A1400A83A69 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "Rswift-watchOS/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = nl.mathijskadijk.rswift.library;
PRODUCT_NAME = Rswift;
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2;
};
name = Release;
};
806E69A41C42BD9C00DE3A8B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -772,6 +937,15 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
2F5FBC4721355A1400A83A69 /* Build configuration list for PBXNativeTarget "Rswift-watchOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
2F5FBC4521355A1400A83A69 /* Debug */,
2F5FBC4621355A1400A83A69 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
806E69A31C42BD9C00DE3A8B /* Build configuration list for PBXNativeTarget "Rswift-tvOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
22 changes: 22 additions & 0 deletions Rswift-watchOS/Info.plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?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>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
</plist>
19 changes: 19 additions & 0 deletions Rswift-watchOS/Rswift_watchOS.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// Rswift_watchOS.h
// Rswift-watchOS
//
// Created by Lammert Westerhoff on 28/08/2018.
// Copyright © 2018 Mathijs Kadijk. All rights reserved.
//

#import <WatchKit/WatchKit.h>

//! Project version number for Rswift_watchOS.
FOUNDATION_EXPORT double Rswift_watchOSVersionNumber;

//! Project version string for Rswift_watchOS.
FOUNDATION_EXPORT const unsigned char Rswift_watchOSVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <Rswift_watchOS/PublicHeader.h>