Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #186

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed #186

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
4 changes: 2 additions & 2 deletions .flutter-plugins
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# This is a generated file; do not edit or check into version control.
file_picker=C:\\Users\\jeff\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\file_picker-5.3.0\\
flutter_plugin_android_lifecycle=C:\\Users\\jeff\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\flutter_plugin_android_lifecycle-2.0.15\\
file_picker=/Users/dsv/.pub-cache/hosted/pub.dev/file_picker-8.0.5/
flutter_plugin_android_lifecycle=/Users/dsv/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.20/
2 changes: 1 addition & 1 deletion .flutter-plugins-dependencies
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"file_picker","path":"C:\\\\Users\\\\jeff\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\file_picker-5.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"file_picker","path":"C:\\\\Users\\\\jeff\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\file_picker-5.3.0\\\\","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\Users\\\\jeff\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\flutter_plugin_android_lifecycle-2.0.15\\\\","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"file_picker","path":"C:\\\\Users\\\\jeff\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\file_picker-5.3.0\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]}],"date_created":"2023-05-22 15:11:17.451790","version":"3.10.1"}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"file_picker","path":"/Users/dsv/.pub-cache/hosted/pub.dev/file_picker-8.0.5/","native_build":true,"dependencies":[]}],"android":[{"name":"file_picker","path":"/Users/dsv/.pub-cache/hosted/pub.dev/file_picker-8.0.5/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","path":"/Users/dsv/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.20/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"file_picker","path":"/Users/dsv/.pub-cache/hosted/pub.dev/file_picker-8.0.5/","dependencies":[]}]},"dependencyGraph":[{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]}],"date_created":"2024-06-27 11:42:48.593543","version":"3.22.2"}
6 changes: 3 additions & 3 deletions example/ios/Flutter/flutter_export_environment.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh
# This is a generated file; do not edit or check into version control.
export "FLUTTER_ROOT=C:\src\flutter"
export "FLUTTER_APPLICATION_PATH=C:\Users\jeff\OneDrive\Projects\Code\Flutter Packages\card_settings\example"
export "FLUTTER_ROOT=/Users/dsv/flutter"
export "FLUTTER_APPLICATION_PATH=/Users/dsv/Projects/artem/card_settings/example"
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
export "FLUTTER_TARGET=lib\main.dart"
export "FLUTTER_TARGET=lib/main.dart"
export "FLUTTER_BUILD_DIR=build"
export "FLUTTER_BUILD_NAME=1.0.0"
export "FLUTTER_BUILD_NUMBER=1.0.0"
Expand Down
1 change: 1 addition & 0 deletions example/macos/Flutter/Flutter-Debug.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include "ephemeral/Flutter-Generated.xcconfig"
1 change: 1 addition & 0 deletions example/macos/Flutter/Flutter-Release.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include "ephemeral/Flutter-Generated.xcconfig"
43 changes: 43 additions & 0 deletions example/macos/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
platform :osx, '10.14'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

project 'Runner', {
'Debug' => :debug,
'Profile' => :release,
'Release' => :release,
}

def flutter_root
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
unless File.exist?(generated_xcode_build_settings_path)
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
end

File.foreach(generated_xcode_build_settings_path) do |line|
matches = line.match(/FLUTTER_ROOT\=(.*)/)
return matches[1].strip if matches
end
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
end

require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)

flutter_macos_podfile_setup

target 'Runner' do
use_frameworks!
use_modular_headers!

flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
target 'RunnerTests' do
inherit! :search_paths
end
end

post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_macos_build_settings(target)
end
end
8 changes: 4 additions & 4 deletions pubspec.yaml

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these updates to pub spec are all that is necessary to bump the dependencies in this PR, if those other files are user unique, could they be deleted and added to a .gitignore?

Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ dependencies:
sdk: flutter
flutter_web_plugins:
sdk: flutter
intl: ^0.18.0
intl: ^0.19.0
meta: ^1.8.0
extended_masked_text: ^2.3.1
extended_masked_text: ^3.0.1
flutter_cupertino_settings: ^0.5.0 # show apple style dialogs
flutter_material_pickers: ^3.5.0 # show android style dialogs
pattern_formatter: ^3.0.0 # used for localized doubles
pattern_formatter: ^4.0.0 # used for localized doubles
flutter_multi_formatter: ^2.10.4 # used for localized phone numbers

dev_dependencies:
flutter_test:
sdk: flutter
test:
test: ^1.25.2
mockito: ^5.3.2

environment:
Expand Down