diff --git a/ios/Podfile b/ios/Podfile index d97f17e..093b079 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -37,8 +37,20 @@ target 'Runner' do end end +#post_install do |installer| +# installer.pods_project.targets.each do |target| +# flutter_additional_ios_build_settings(target) +# end +#end + post_install do |installer| - installer.pods_project.targets.each do |target| - flutter_additional_ios_build_settings(target) + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + target.build_configurations.each do |config| + xcconfig_path = config.base_configuration_reference.real_path + xcconfig = File.read(xcconfig_path) + xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR") + File.open(xcconfig_path, "w") { |file| file << xcconfig_mod } + end + end end -end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index dcffd1c..694bfd9 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -71,6 +71,16 @@ PODS: - CocoaAsyncSocket - KTVHTTPCache (2.0.1): - KTVCocoaHTTPServer + - mapbox_maps_flutter (1.0.0): + - Flutter + - MapboxMaps (~> 11.2.0) + - MapboxCommon (24.2.0) + - MapboxCoreMaps (11.2.0): + - MapboxCommon (~> 24.2) + - MapboxMaps (11.2.0): + - MapboxCommon (= 24.2.0) + - MapboxCoreMaps (= 11.2.0) + - Turf (= 2.8.0) - OrderedSet (5.0.0) - path_provider_foundation (0.0.1): - Flutter @@ -85,6 +95,7 @@ PODS: - Flutter - FMDB (>= 2.7.5) - Toast (4.0.0) + - Turf (2.8.0) - url_launcher_ios (0.0.1): - Flutter - video_player_avfoundation (0.0.1): @@ -106,6 +117,7 @@ DEPENDENCIES: - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`) - just_audio (from `.symlinks/plugins/just_audio/ios`) + - mapbox_maps_flutter (from `.symlinks/plugins/mapbox_maps_flutter/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) @@ -131,9 +143,13 @@ SPEC REPOS: - GTMSessionFetcher - KTVCocoaHTTPServer - KTVHTTPCache + - MapboxCommon + - MapboxCoreMaps + - MapboxMaps - OrderedSet - PromisesObjC - Toast + - Turf EXTERNAL SOURCES: audio_session: @@ -158,6 +174,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/google_maps_flutter_ios/ios" just_audio: :path: ".symlinks/plugins/just_audio/ios" + mapbox_maps_flutter: + :path: ".symlinks/plugins/mapbox_maps_flutter/ios" path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: @@ -201,6 +219,10 @@ SPEC CHECKSUMS: just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa KTVCocoaHTTPServer: df8d7b861e603ff8037e9b2138aca2563a6b768d KTVHTTPCache: 588c3eb16f6bd1e6fde1e230dabfb7bd4e490a4d + mapbox_maps_flutter: 7954cf84b3973ec17d49b483f31baad6abde6c48 + MapboxCommon: f40f1e8c8f3ee8e2bee3b15437812ab114722420 + MapboxCoreMaps: 4294d3178201702a95f2ae316bc4ad419f5fa16a + MapboxMaps: 413cb886e75b6703c0a3084ce84c29cd681d916f OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 @@ -208,11 +230,12 @@ SPEC CHECKSUMS: shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 + Turf: aa2ede4298009639d10db36aba1a7ebaad072a5e url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126 wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a -PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796 +PODFILE CHECKSUM: 9b7a026f4dffa1d94ef3ddb6614244489799ecf1 COCOAPODS: 1.12.1 diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard index f3c2851..e68a24c 100644 --- a/ios/Runner/Base.lproj/Main.storyboard +++ b/ios/Runner/Base.lproj/Main.storyboard @@ -1,8 +1,10 @@ - - + + + - + + @@ -14,13 +16,14 @@ - + - + + diff --git a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig index a9fb3fe..017ccc3 100644 --- a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig +++ b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig @@ -1,6 +1,6 @@ // This is a generated file; do not edit or check into version control. -FLUTTER_ROOT=C:\PROJ\flutter -FLUTTER_APPLICATION_PATH=C:\Users\ThomasFransolet\Documents\Documents\Perso\MuseeDeLaFraise\tablet-app +FLUTTER_ROOT=/Users/thomasfransolet/Documents/flutter +FLUTTER_APPLICATION_PATH=/Users/thomasfransolet/Documents/Proj/MyMuseum/tablet_app COCOAPODS_PARALLEL_CODE_SIGN=true FLUTTER_BUILD_DIR=build FLUTTER_BUILD_NAME=2.0.3 diff --git a/macos/Flutter/ephemeral/flutter_export_environment.sh b/macos/Flutter/ephemeral/flutter_export_environment.sh old mode 100644 new mode 100755 index 960616d..0ddf898 --- a/macos/Flutter/ephemeral/flutter_export_environment.sh +++ b/macos/Flutter/ephemeral/flutter_export_environment.sh @@ -1,7 +1,7 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=C:\PROJ\flutter" -export "FLUTTER_APPLICATION_PATH=C:\Users\ThomasFransolet\Documents\Documents\Perso\MuseeDeLaFraise\tablet-app" +export "FLUTTER_ROOT=/Users/thomasfransolet/Documents/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/thomasfransolet/Documents/Proj/MyMuseum/tablet_app" export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_BUILD_DIR=build" export "FLUTTER_BUILD_NAME=2.0.3"