Merge pull request #182 from janvennemann/TIMOB-24862-2_1_X

[TIMOB-24862] Pass correct SDK version to CocoaPods build (2_1_X)
tidev · Jun 21, 2017 · 9da2627 · 9da2627
2 parents 6f18585 + 5e75d87
commit 9da2627
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/metabase/ios/lib/metabase.js b/metabase/ios/lib/metabase.js
@@ -537,7 +537,8 @@ function runCocoaPodsBuild (basedir, builder, callback) {
 		minSDKVersion = builder.minIosVer,
 		xcodesettings = builder.xcodeEnv.executables,
 		spawn = require('child_process').spawn,
-		sdk = sdkType + sdkVersion,
+		// Make sure SDK version is always in MAJOR.MINOR format
+		sdk = sdkType + (/\d+\.\d+\.\d+/.test(sdkVersion) ? sdkVersion.substring(0, sdkVersion.lastIndexOf('.')) : sdkVersion),
 		productsDirectory = path.join(basedir, 'build/iphone/build/Products'),
 		buildConfigurationName = builder.xcodeTarget,
 		args = [