Skip to content

Commit 291e3b4

Browse files
MartoYankovSvetoslavTsenov
MartoYankov
authored and
SvetoslavTsenov
committed
fix(ios): move material design dependency to podfile (#7592)
1 parent e35bda2 commit 291e3b4

9 files changed

Lines changed: 3 additions & 130 deletions

File tree

‎tns-core-modules-widgets/.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ local.properties
4646
ios/TNSWidgets/TNSWidgets.xcodeproj/project.xcworkspace/xcuserdata/
4747
ios/TNSWidgets/TNSWidgets.xcodeproj/xcuserdata/
4848
ios/TNSWidgets/DerivedData/
49-
ios/TNSWidgets/Pods/
5049
xcuserdata/
5150

5251
android/widgets/bin

‎tns-core-modules-widgets/build.ios.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ cd ios
1616
cd ..
1717
echo "Copy ios/TNSWidgets/build/*.framework dist/package/platforms/ios"
1818

19-
cp -R ios/TNSWidgets/build/MaterialComponents.framework dist/package/platforms/ios
20-
cp -R ios/TNSWidgets/build/MDFInternationalization.framework dist/package/platforms/ios
21-
cp -R ios/TNSWidgets/build/Pods_TNSWidgets.framework dist/package/platforms/ios
2219
cp -R ios/TNSWidgets/build/TNSWidgets.framework dist/package/platforms/ios
2320

2421
cp ios/TNSWidgets/build/*.framework.dSYM.zip dist/package/platforms/ios

‎tns-core-modules-widgets/ios/TNSWidgets/Podfile‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎tns-core-modules-widgets/ios/TNSWidgets/Podfile.lock‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
3E944C4C61C317F04FCA72D5 /* Pods_TNSWidgets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9DA784D6AE838F6BE65AB7D /* Pods_TNSWidgets.framework */; };
1110
8B7321CF1D097ECD00884AC6 /* TNSLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B7321CD1D097ECD00884AC6 /* TNSLabel.h */; settings = {ATTRIBUTES = (Public, ); }; };
1211
8B7321D01D097ECD00884AC6 /* TNSLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B7321CE1D097ECD00884AC6 /* TNSLabel.m */; };
1312
B8E76F52212C2DA2009CFCE2 /* NSObject+Swizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = B8E76F50212C2DA2009CFCE2 /* NSObject+Swizzling.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -36,7 +35,6 @@
3635
/* End PBXContainerItemProxy section */
3736

3837
/* Begin PBXFileReference section */
39-
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>"; };
4038
8B7321CD1D097ECD00884AC6 /* TNSLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TNSLabel.h; sourceTree = "<group>"; };
4139
8B7321CE1D097ECD00884AC6 /* TNSLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TNSLabel.m; sourceTree = "<group>"; };
4240
B8E76F50212C2DA2009CFCE2 /* NSObject+Swizzling.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject+Swizzling.h"; sourceTree = "<group>"; };
@@ -45,8 +43,6 @@
4543
B8E76F59212C2F4E009CFCE2 /* UIView+PropertyBag.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+PropertyBag.m"; sourceTree = "<group>"; };
4644
B8E76F5C212C3134009CFCE2 /* UIView+PassThroughParent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+PassThroughParent.h"; sourceTree = "<group>"; };
4745
B8E76F5D212C3134009CFCE2 /* UIView+PassThroughParent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+PassThroughParent.m"; sourceTree = "<group>"; };
48-
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>"; };
49-
C9DA784D6AE838F6BE65AB7D /* Pods_TNSWidgets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TNSWidgets.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5046
F915D3531EC9EF5E00071914 /* TNSProcess.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TNSProcess.m; path = ../TNSProcess.m; sourceTree = "<group>"; };
5147
F915D3541EC9EF5E00071914 /* TNSProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TNSProcess.h; path = ../TNSProcess.h; sourceTree = "<group>"; };
5248
F98F5CAF1CD0EFEA00978308 /* TNSWidgets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TNSWidgets.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -64,7 +60,6 @@
6460
isa = PBXFrameworksBuildPhase;
6561
buildActionMask = 2147483647;
6662
files = (
67-
3E944C4C61C317F04FCA72D5 /* Pods_TNSWidgets.framework in Frameworks */,
6863
);
6964
runOnlyForDeploymentPostprocessing = 0;
7065
};
@@ -79,31 +74,12 @@
7974
/* End PBXFrameworksBuildPhase section */
8075

8176
/* Begin PBXGroup section */
82-
23F4E40A96EF6D33AE4654D3 /* Frameworks */ = {
83-
isa = PBXGroup;
84-
children = (
85-
C9DA784D6AE838F6BE65AB7D /* Pods_TNSWidgets.framework */,
86-
);
87-
name = Frameworks;
88-
sourceTree = "<group>";
89-
};
90-
50D824CFC5BFEB60164D83B1 /* Pods */ = {
91-
isa = PBXGroup;
92-
children = (
93-
BA714249C33720A4C73F2D73 /* Pods-TNSWidgets.debug.xcconfig */,
94-
0CA2D2E3500594F250B7E5AD /* Pods-TNSWidgets.release.xcconfig */,
95-
);
96-
name = Pods;
97-
sourceTree = "<group>";
98-
};
9977
F98F5CA51CD0EFEA00978308 = {
10078
isa = PBXGroup;
10179
children = (
10280
F98F5CB11CD0EFEA00978308 /* TNSWidgets */,
10381
F98F5CBD1CD0EFEA00978308 /* TNSWidgetsTests */,
10482
F98F5CB01CD0EFEA00978308 /* Products */,
105-
50D824CFC5BFEB60164D83B1 /* Pods */,
106-
23F4E40A96EF6D33AE4654D3 /* Frameworks */,
10783
);
10884
sourceTree = "<group>";
10985
};
@@ -170,7 +146,6 @@
170146
isa = PBXNativeTarget;
171147
buildConfigurationList = F98F5CC31CD0EFEA00978308 /* Build configuration list for PBXNativeTarget "TNSWidgets" */;
172148
buildPhases = (
173-
A19DC6B35DC47BC836BB21AE /* [CP] Check Pods Manifest.lock */,
174149
F98F5CAA1CD0EFEA00978308 /* Sources */,
175150
F98F5CAB1CD0EFEA00978308 /* Frameworks */,
176151
F98F5CAC1CD0EFEA00978308 /* Headers */,
@@ -255,31 +230,6 @@
255230
};
256231
/* End PBXResourcesBuildPhase section */
257232

258-
/* Begin PBXShellScriptBuildPhase section */
259-
A19DC6B35DC47BC836BB21AE /* [CP] Check Pods Manifest.lock */ = {
260-
isa = PBXShellScriptBuildPhase;
261-
buildActionMask = 2147483647;
262-
files = (
263-
);
264-
inputFileListPaths = (
265-
);
266-
inputPaths = (
267-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
268-
"${PODS_ROOT}/Manifest.lock",
269-
);
270-
name = "[CP] Check Pods Manifest.lock";
271-
outputFileListPaths = (
272-
);
273-
outputPaths = (
274-
"$(DERIVED_FILE_DIR)/Pods-TNSWidgets-checkManifestLockResult.txt",
275-
);
276-
runOnlyForDeploymentPostprocessing = 0;
277-
shellPath = /bin/sh;
278-
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";
279-
showEnvVarsInLog = 0;
280-
};
281-
/* End PBXShellScriptBuildPhase section */
282-
283233
/* Begin PBXSourcesBuildPhase section */
284234
F98F5CAA1CD0EFEA00978308 /* Sources */ = {
285235
isa = PBXSourcesBuildPhase;
@@ -403,7 +353,6 @@
403353
};
404354
F98F5CC41CD0EFEA00978308 /* Debug */ = {
405355
isa = XCBuildConfiguration;
406-
baseConfigurationReference = BA714249C33720A4C73F2D73 /* Pods-TNSWidgets.debug.xcconfig */;
407356
buildSettings = {
408357
DEFINES_MODULE = YES;
409358
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -420,7 +369,6 @@
420369
};
421370
F98F5CC51CD0EFEA00978308 /* Release */ = {
422371
isa = XCBuildConfiguration;
423-
baseConfigurationReference = 0CA2D2E3500594F250B7E5AD /* Pods-TNSWidgets.release.xcconfig */;
424372
buildSettings = {
425373
DEFINES_MODULE = YES;
426374
DYLIB_COMPATIBILITY_VERSION = 1;

‎tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcworkspace/contents.xcworkspacedata‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎tns-core-modules-widgets/ios/build.sh‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,11 @@
33
echo "Set exit on simple errors"
44
set -e
55

6-
(
7-
echo "update pods"
8-
cd TNSWidgets
9-
pod install
10-
)
11-
126
echo "Build for iphonesimulator"
13-
xcodebuild -workspace TNSWidgets/TNSWidgets.xcworkspace -scheme TNSWidgets -sdk iphonesimulator -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build -quiet
7+
xcodebuild -project TNSWidgets/TNSWidgets.xcodeproj -scheme TNSWidgets -sdk iphonesimulator -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build -quiet
148

159
echo "Build for iphoneos"
16-
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
10+
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
1711

1812
function buildFatFramework() {
1913
FRAMEWORK_NAME=$1
@@ -50,6 +44,3 @@ function buildFatFramework() {
5044
}
5145

5246
buildFatFramework TNSWidgets .
53-
buildFatFramework Pods_TNSWidgets .
54-
buildFatFramework MDFInternationalization MDFInternationalization
55-
buildFatFramework MaterialComponents MaterialComponents

‎tns-core-modules/platforms/ios/Podfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pod 'MaterialComponents/Tabs', '~> 84.4'

0 commit comments

Comments
 (0)