Skip to content
Open
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
*.swp
.DS_Store
.atom/
.build/
.buildlog/
.history
.svn/
.swiftpm/
migrate_working_dir/

# IntelliJ related
Expand Down
1 change: 1 addition & 0 deletions ios/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 "Generated.xcconfig"
1 change: 1 addition & 0 deletions ios/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 "Generated.xcconfig"
43 changes: 43 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '13.0'

# 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', '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 Generated.xcconfig, then run flutter pub get"
end

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

flutter_ios_podfile_setup

target 'Runner' do
use_frameworks!

flutter_install_all_ios_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_ios_build_settings(target)
end
end
19 changes: 13 additions & 6 deletions lib/firebase_options.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:flutter/foundation.dart'
/// Default [FirebaseOptions] for use with your Firebase apps.
///
/// Example:
/// ```dart
/// ```
/// import 'firebase_options.dart';
/// // ...
/// await Firebase.initializeApp(
Expand All @@ -28,10 +28,7 @@ class DefaultFirebaseOptions {
case TargetPlatform.iOS:
return ios;
case TargetPlatform.macOS:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for macos - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
return macos; // Fixed: Now returns macOS config
case TargetPlatform.windows:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for windows - '
Expand Down Expand Up @@ -67,4 +64,14 @@ class DefaultFirebaseOptions {
iosBundleId: 'com.example.firebaseEditorGsoc',
);

}
// Added macOS configuration (using iOS config as base)
static const FirebaseOptions macos = FirebaseOptions(
apiKey: 'AIzaSyAfe7Be2vESlx3uSGQs_zZ12QWN-EdBgGs',
appId: '1:211384953661:ios:007f4e6da5f618ea317354',
messagingSenderId: '211384953661',
projectId: 'gsoc-24-3f4d1',
storageBucket: 'gsoc-24-3f4d1.appspot.com',
iosClientId: '211384953661-9hkosute6of7qapl18kjacl04m6f14ko.apps.googleusercontent.com',
iosBundleId: 'com.example.firebaseEditorGsoc',
);
}
1 change: 1 addition & 0 deletions 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 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"
87 changes: 87 additions & 0 deletions macos/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
platform :osx, '10.15'

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

# ULTIMATE SOLUTION: Fixes -G flag, ARM64 assembly, and c-ares header issues
post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.15'

# NUKE ALL -G FLAG SOURCES
config.build_settings.delete('GCC_WARN_INHIBIT_ALL_WARNINGS')
config.build_settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = 'NO'
config.build_settings['WARNING_CFLAGS'] = ['$(inherited)', '-Wno-everything']
config.build_settings['OTHER_CFLAGS'] = ['$(inherited)', '-Wno-everything']
config.build_settings['OTHER_CPLUSPLUSFLAGS'] = ['$(inherited)', '-Wno-everything', '-std=c++17']

# FIX ARM64 ASSEMBLY SYMBOLS FOR BoringSSL-GRPC
if target.name == 'BoringSSL-GRPC'
config.build_settings['OTHER_CFLAGS'] = ['$(inherited)', '-Wno-everything', '-DOPENSSL_NO_ASM']
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = ['$(inherited)', 'OPENSSL_NO_ASM=1', 'COCOAPODS=1']
end

# FIX C-ARES HEADER ISSUES FOR gRPC-Core
if target.name == 'gRPC-Core'
config.build_settings['WARNING_CFLAGS'] = ['-Wno-everything']
config.build_settings['OTHER_CFLAGS'] = ['-Wno-everything', '-DGRPC_ARES=0']
config.build_settings['OTHER_CPLUSPLUSFLAGS'] = ['-Wno-everything', '-std=c++17', '-DGRPC_ARES=0']
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = ['$(inherited)', 'GRPC_ARES=0', 'COCOAPODS=1']
config.build_settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = 'NO'
end

# ADDITIONAL FIXES FOR OTHER PROBLEMATIC PODS
if ['gRPC-C++', 'abseil'].include?(target.name)
config.build_settings['WARNING_CFLAGS'] = ['-Wno-everything']
config.build_settings['OTHER_CFLAGS'] = ['-Wno-everything']
config.build_settings['OTHER_CPLUSPLUSFLAGS'] = ['-Wno-everything', '-std=c++17']
config.build_settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = 'NO'
end
end

# REMOVE FLAGS FROM SOURCE FILES (nuclear cleanup)
if ['BoringSSL-GRPC', 'gRPC-Core'].include?(target.name)
target.source_build_phase.files.each do |file|
if file.settings
file.settings.delete('COMPILER_FLAGS')
end
end
end

flutter_additional_macos_build_settings(target)
end
end
Loading