diff --git a/apps/automated/package.json b/apps/automated/package.json index 67a19b86e..9198b309f 100644 --- a/apps/automated/package.json +++ b/apps/automated/package.json @@ -15,7 +15,7 @@ }, "devDependencies": { "@nativescript/android": "7.0.1", - "@nativescript/ios": "7.1.0", + "@nativescript/ios": "7.2.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", "typescript": "file:../../node_modules/typescript" }, diff --git a/apps/toolbox/package.json b/apps/toolbox/package.json index 4bca9f519..b48c530fa 100644 --- a/apps/toolbox/package.json +++ b/apps/toolbox/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@nativescript/android": "7.0.1", - "@nativescript/ios": "7.1.0", + "@nativescript/ios": "7.2.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", "typescript": "file:../../node_modules/typescript" } diff --git a/apps/ui/package.json b/apps/ui/package.json index 600d2fd41..a28bb6f74 100644 --- a/apps/ui/package.json +++ b/apps/ui/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@nativescript/android": "7.0.1", - "@nativescript/ios": "7.1.0", + "@nativescript/ios": "7.2.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", "typescript": "file:../../node_modules/typescript" }, diff --git a/package.json b/package.json index 716575868..af5fa1226 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "mocha": "^8.0.1", "mocha-typescript": "^1.1.17", "module-alias": "^2.2.2", - "nativescript": "~7.1.0", + "nativescript": "~7.2.0", "node-sass": "~4.14.1", "parse-css": "git+https://github.com/tabatkins/parse-css.git", "parserlib": "^1.1.1", diff --git a/packages/core/package.json b/packages/core/package.json index 44b6c3108..63407ee0e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,7 +3,7 @@ "main": "index", "types": "index.d.ts", "description": "NativeScript Core Modules", - "version": "7.1.4", + "version": "7.2.0", "homepage": "https://nativescript.org", "repository": { "type": "git", diff --git a/packages/core/platforms/ios/Podfile b/packages/core/platforms/ios/Podfile index 7ba729baa..4a935d972 100644 --- a/packages/core/platforms/ios/Podfile +++ b/packages/core/platforms/ios/Podfile @@ -1,4 +1,12 @@ -platform :ios, '9.0' +platform :ios, '12.0' use_frameworks! -pod 'MaterialComponents/Tabs', '~> 94.5' \ No newline at end of file +pod 'MaterialComponents/Tabs', '~> 94.5' + +post_install do |installer| + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' + end + end +end \ No newline at end of file diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/Info.plist index 83ff73fcd..953413568 100644 --- a/packages/core/platforms/ios/TNSWidgets.xcframework/Info.plist +++ b/packages/core/platforms/ios/TNSWidgets.xcframework/Info.plist @@ -4,6 +4,20 @@ AvailableLibraries + + DebugSymbolsPath + dSYMs + LibraryIdentifier + ios-arm64 + LibraryPath + TNSWidgets.framework + SupportedArchitectures + + arm64 + + SupportedPlatform + ios + DebugSymbolsPath dSYMs @@ -21,20 +35,6 @@ SupportedPlatformVariant simulator - - DebugSymbolsPath - dSYMs - LibraryIdentifier - ios-arm64 - LibraryPath - TNSWidgets.framework - SupportedArchitectures - - arm64 - - SupportedPlatform - ios - CFBundlePackageType XFWK diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/TNSWidgets index 7c2885ee5..6078a3943 100755 Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/TNSWidgets and b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/TNSWidgets differ diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets index 2ab572afa..28407f0a9 100644 Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets and b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets differ diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets index 8a8740446..3c467383e 100755 Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets and b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets differ diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets index 206c42de9..3124a3365 100644 Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets and b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets differ diff --git a/packages/core/ui/styling/background.android.ts b/packages/core/ui/styling/background.android.ts index 7d1856f4f..65459fdb9 100644 --- a/packages/core/ui/styling/background.android.ts +++ b/packages/core/ui/styling/background.android.ts @@ -45,9 +45,8 @@ export namespace ad { androidView._cachedDrawable = constantState || drawable; } const isBorderDrawable = drawable instanceof org.nativescript.widgets.BorderDrawable; - const isColorDrawable = drawable instanceof android.graphics.drawable.ColorDrawable; const onlyColor = !background.hasBorderWidth() && !background.hasBorderRadius() && !background.clipPath && !background.image && !!background.color; - if (!isBorderDrawable && isColorDrawable && onlyColor) { + if (!isBorderDrawable && drawable instanceof android.graphics.drawable.ColorDrawable && onlyColor) { drawable.setColor(background.color.android); drawable.invalidateSelf(); } else if (isSetColorFilterOnlyWidget(nativeView) && drawable && onlyColor) { diff --git a/tools/assets/App_Resources/iOS/build.xcconfig b/tools/assets/App_Resources/iOS/build.xcconfig index e77e78db9..f8e9da181 100644 --- a/tools/assets/App_Resources/iOS/build.xcconfig +++ b/tools/assets/App_Resources/iOS/build.xcconfig @@ -4,3 +4,4 @@ // To build for device with Xcode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html // DEVELOPMENT_TEAM = YOUR_TEAM_ID; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; +IPHONEOS_DEPLOYMENT_TARGET = 12.0;