Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ disabled_rules:
- cyclomatic_complexity # We'll catch future issues in code review.
- nesting # We have some cases where deeper nesting is desirable.
- trailing_whitespace # So annoying...
- computed_accessors_order
- unneeded_notification_center_removal
- mark

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions ModuleMaps/MDC/AppBar/AppBar.modulemaps/module.modulemap

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions ModuleMaps/MDC/Buttons/Buttons.modulemaps/module.modulemap

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions ModuleMaps/MDC/Dialogs/Dialogs.modulemaps/module.modulemap

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions ModuleMaps/MDC/Ink/Ink.modulemaps/module.modulemap

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions ModuleMaps/MDC/Palettes/Palettes.modulemaps/module.modulemap

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions ModuleMaps/MDC/Snackbar/Snackbar.modulemaps/module.modulemap

This file was deleted.

4 changes: 0 additions & 4 deletions ModuleMaps/MDC/Tabs/Tabs.modulemaps/module.modulemap

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions ModuleMaps/MDC/Themes/Themes.modulemaps/module.modulemap

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions ModuleMaps/MDC/private/Math/Math.modulemaps/module.modulemap

This file was deleted.

This file was deleted.

This file was deleted.

45 changes: 0 additions & 45 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,53 +71,8 @@ post_install do |installer|
puts "Setting deployment target #{deployment_target} for #{config.name} on #{target.name}..."
end
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
upgrade_to_recommended_settings! config
end
end
puts "Generating Science Journal protos..."
system("cd Protos && ./generate.sh")
puts "Removing unfixable warnings..."
remove_unfixable_warnings! installer
puts "Fixing UIWebView usage..."
replace_uiwebview_with_wkwebview! installer
end

def upgrade_to_recommended_settings! config
if Pod::VERSION == '1.7.3'
# Having this set triggers Xcode's "Upgrade to recommended settings"
config.build_settings.delete('ARCHS')
end
end

def remove_unfixable_warnings! installer
installer.pod_targets.each do |target|
if target.name == 'MaterialComponents' && target.version == '85.0.0'
# The *ColorThemer types currently emit deprecation warnings,
# but the new versions aren't available yet.
installer.pods_project.files.map(&:path).grep(/MDC\w+ColorThemer.h/).each do |file|
path = "Pods/MaterialComponents/#{file}"
content = IO.read(path).gsub(/__deprecated_msg\([^)]*\)/, '')
File.chmod(0644, path)
IO.write(path, content)
File.chmod(0444, path)
end
end
end
end

def replace_uiwebview_with_wkwebview! installer
installer.pod_targets.each do |target|
if target.name == 'MaterialComponents' && target.version == '85.0.0'
installer.pods_project.files.map(&:path).grep(/MDCBottomSheetPresentationController.m/).each do |file|
path = "Pods/MaterialComponents/#{file}"
content = IO.read(path)
.gsub(/UIWebView/, 'WKWebView')
.gsub(/#import "MDCBottomSheetPresentationController.h"/,
"#import \"MDCBottomSheetPresentationController.h\"\n\n#import <WebKit/WebKit.h>\n")
File.chmod(0644, path)
IO.write(path, content)
File.chmod(0444, path)
end
end
end
end
Loading