javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ios): move material design dependency to podfile (#7592)

Browse Source
This commit is contained in:
Martin Yankov
2019-07-28 22:22:29 +03:00
committed by Svetoslav
parent e35bda2c19
commit 291e3b4b2e
9 changed files with 3 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tns-core-modules-widgets/.gitignore vendored
View File

@@ -46,7 +46,6 @@ local.properties
ios/TNSWidgets/TNSWidgets.xcodeproj/project.xcworkspace/xcuserdata/
ios/TNSWidgets/TNSWidgets.xcodeproj/xcuserdata/
ios/TNSWidgets/DerivedData/
ios/TNSWidgets/Pods/
xcuserdata/
android/widgets/bin

3
tns-core-modules-widgets/build.ios.sh
View File

@@ -16,9 +16,6 @@ cd ios
cd ..
echo "Copy ios/TNSWidgets/build/*.framework dist/package/platforms/ios"
cp -R ios/TNSWidgets/build/MaterialComponents.framework dist/package/platforms/ios
cp -R ios/TNSWidgets/build/MDFInternationalization.framework dist/package/platforms/ios
cp -R ios/TNSWidgets/build/Pods_TNSWidgets.framework dist/package/platforms/ios
cp -R ios/TNSWidgets/build/TNSWidgets.framework dist/package/platforms/ios
cp ios/TNSWidgets/build/*.framework.dSYM.zip dist/package/platforms/ios

6
tns-core-modules-widgets/ios/TNSWidgets/Podfile
View File

@@ -1,6 +0,0 @@
platform :ios, '10.0'
use_frameworks!
target 'TNSWidgets' do
pod 'MaterialComponents/Tabs', '84.4.0'
end

39
tns-core-modules-widgets/ios/TNSWidgets/Podfile.lock
View File

@@ -1,39 +0,0 @@
PODS:
- MaterialComponents/AnimationTiming (84.4.0)
- MaterialComponents/Ink (84.4.0):
- MaterialComponents/private/Math
- MaterialComponents/Palettes (84.4.0)
- MaterialComponents/private/Application (84.4.0)
- MaterialComponents/private/Math (84.4.0)
- MaterialComponents/ShadowElevations (84.4.0)
- MaterialComponents/ShadowLayer (84.4.0):
- MaterialComponents/ShadowElevations
- MaterialComponents/Tabs (84.4.0):
- MaterialComponents/AnimationTiming
- MaterialComponents/Ink
- MaterialComponents/Palettes
- MaterialComponents/private/Math
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MDFInternationalization
- MaterialComponents/Typography (84.4.0):
- MaterialComponents/private/Application
- MaterialComponents/private/Math
- MDFInternationalization (2.0.0)
DEPENDENCIES:
- MaterialComponents/Tabs (= 84.4.0)
SPEC REPOS:
https://github.com/cocoapods/specs.git:
- MaterialComponents
- MDFInternationalization
SPEC CHECKSUMS:
MaterialComponents: e31f67324695bb1b537e5eccaee62db07ac3d06b
MDFInternationalization: 010097556d6b09d2c4ea38e0820ea6d37be6a314
PODFILE CHECKSUM: cf8c5f11be5a664a1b63632768c1ac024bf37a30
COCOAPODS: 1.5.3

52
tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcodeproj/project.pbxproj
View File

@@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
3E944C4C61C317F04FCA72D5 /* Pods_TNSWidgets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9DA784D6AE838F6BE65AB7D /* Pods_TNSWidgets.framework */; };
8B7321CF1D097ECD00884AC6 /* TNSLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B7321CD1D097ECD00884AC6 /* TNSLabel.h */; settings = {ATTRIBUTES = (Public, ); }; };
8B7321D01D097ECD00884AC6 /* TNSLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B7321CE1D097ECD00884AC6 /* TNSLabel.m */; };
B8E76F52212C2DA2009CFCE2 /* NSObject+Swizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = B8E76F50212C2DA2009CFCE2 /* NSObject+Swizzling.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -36,7 +35,6 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
0CA2D2E3500594F250B7E5AD /* Pods-TNSWidgets.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TNSWidgets.release.xcconfig"; path = "Pods/Target Support Files/Pods-TNSWidgets/Pods-TNSWidgets.release.xcconfig"; sourceTree = "<group>"; };
8B7321CD1D097ECD00884AC6 /* TNSLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TNSLabel.h; sourceTree = "<group>"; };
8B7321CE1D097ECD00884AC6 /* TNSLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TNSLabel.m; sourceTree = "<group>"; };
B8E76F50212C2DA2009CFCE2 /* NSObject+Swizzling.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject+Swizzling.h"; sourceTree = "<group>"; };
@@ -45,8 +43,6 @@
B8E76F59212C2F4E009CFCE2 /* UIView+PropertyBag.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+PropertyBag.m"; sourceTree = "<group>"; };
B8E76F5C212C3134009CFCE2 /* UIView+PassThroughParent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+PassThroughParent.h"; sourceTree = "<group>"; };
B8E76F5D212C3134009CFCE2 /* UIView+PassThroughParent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+PassThroughParent.m"; sourceTree = "<group>"; };
BA714249C33720A4C73F2D73 /* Pods-TNSWidgets.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TNSWidgets.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TNSWidgets/Pods-TNSWidgets.debug.xcconfig"; sourceTree = "<group>"; };
C9DA784D6AE838F6BE65AB7D /* Pods_TNSWidgets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TNSWidgets.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F915D3531EC9EF5E00071914 /* TNSProcess.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TNSProcess.m; path = ../TNSProcess.m; sourceTree = "<group>"; };
F915D3541EC9EF5E00071914 /* TNSProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TNSProcess.h; path = ../TNSProcess.h; sourceTree = "<group>"; };
F98F5CAF1CD0EFEA00978308 /* TNSWidgets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TNSWidgets.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -64,7 +60,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3E944C4C61C317F04FCA72D5 /* Pods_TNSWidgets.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -79,31 +74,12 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
23F4E40A96EF6D33AE4654D3 /* Frameworks */ = {
isa = PBXGroup;
children = (
C9DA784D6AE838F6BE65AB7D /* Pods_TNSWidgets.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
50D824CFC5BFEB60164D83B1 /* Pods */ = {
isa = PBXGroup;
children = (
BA714249C33720A4C73F2D73 /* Pods-TNSWidgets.debug.xcconfig */,
0CA2D2E3500594F250B7E5AD /* Pods-TNSWidgets.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
F98F5CA51CD0EFEA00978308 = {
isa = PBXGroup;
children = (
F98F5CB11CD0EFEA00978308 /* TNSWidgets */,
F98F5CBD1CD0EFEA00978308 /* TNSWidgetsTests */,
F98F5CB01CD0EFEA00978308 /* Products */,
50D824CFC5BFEB60164D83B1 /* Pods */,
23F4E40A96EF6D33AE4654D3 /* Frameworks */,
);
sourceTree = "<group>";
};
@@ -170,7 +146,6 @@
isa = PBXNativeTarget;
buildConfigurationList = F98F5CC31CD0EFEA00978308 /* Build configuration list for PBXNativeTarget "TNSWidgets" */;
buildPhases = (
A19DC6B35DC47BC836BB21AE /* [CP] Check Pods Manifest.lock */,
F98F5CAA1CD0EFEA00978308 /* Sources */,
F98F5CAB1CD0EFEA00978308 /* Frameworks */,
F98F5CAC1CD0EFEA00978308 /* Headers */,
@@ -255,31 +230,6 @@
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
A19DC6B35DC47BC836BB21AE /* [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-TNSWidgets-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 */
F98F5CAA1CD0EFEA00978308 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -403,7 +353,6 @@
};
F98F5CC41CD0EFEA00978308 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BA714249C33720A4C73F2D73 /* Pods-TNSWidgets.debug.xcconfig */;
buildSettings = {
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -420,7 +369,6 @@
};
F98F5CC51CD0EFEA00978308 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 0CA2D2E3500594F250B7E5AD /* Pods-TNSWidgets.release.xcconfig */;
buildSettings = {
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;

10
tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcworkspace/contents.xcworkspacedata generated
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "group:TNSWidgets.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace>

8
tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View File

@@ -1,8 +0,0 @@
<?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>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

13
tns-core-modules-widgets/ios/build.sh
View File

@@ -3,17 +3,11 @@
echo "Set exit on simple errors"
set -e
(
echo "update pods"
cd TNSWidgets
pod install
)
echo "Build for iphonesimulator"
xcodebuild -workspace TNSWidgets/TNSWidgets.xcworkspace -scheme TNSWidgets -sdk iphonesimulator -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build -quiet
xcodebuild -project TNSWidgets/TNSWidgets.xcodeproj -scheme TNSWidgets -sdk iphonesimulator -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build -quiet
echo "Build for iphoneos"
xcodebuild -workspace TNSWidgets/TNSWidgets.xcworkspace -scheme TNSWidgets -sdk iphoneos -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -quiet
xcodebuild -project TNSWidgets/TNSWidgets.xcodeproj -scheme TNSWidgets -sdk iphoneos -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -quiet
function buildFatFramework() {
FRAMEWORK_NAME=$1
@@ -50,6 +44,3 @@ function buildFatFramework() {
}
buildFatFramework TNSWidgets .
buildFatFramework Pods_TNSWidgets .
buildFatFramework MDFInternationalization MDFInternationalization
buildFatFramework MaterialComponents MaterialComponents

1
tns-core-modules/platforms/ios/Podfile Normal file
View File

@@ -0,0 +1 @@
pod 'MaterialComponents/Tabs', '~> 84.4'