Skip to content

Commit

Permalink
[FIX] Build apple & silent flutter lints
Browse files Browse the repository at this point in the history
  • Loading branch information
mat-his committed Apr 12, 2024
1 parent 401bdeb commit d3b9c40
Show file tree
Hide file tree
Showing 14 changed files with 151 additions and 34 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Check Dart format
run: melos run check-format --no-select
- name: Dart code analysis
run: melos run analyze --no-select
run: melos run analyze --no-select --no-fatal-infos --no-fatal-warnings
- name: Run Dart tests
run: melos run test

Expand Down Expand Up @@ -173,11 +173,14 @@ jobs:
echo "DEVICE_ID=$DEVICE_ID" >> $GITHUB_ENV
xcrun simctl boot $DEVICE_ID
- name: Bootstrap
run: melos bs
- name: Build the XCFramework
run: melos run build:apple
- name: Copy the XCFramework to the needed location
run: |
CURR_VERSION=codde_protocol-v`awk '/^version: /{print $2}' packages/codde_protocol/pubspec.yaml`
mkdir -p packages/flutter_codde_protocol/ios/Frameworks
cp platform-build/CoddeProtocol.xcframework.zip packages/flutter_codde_protocol/ios/Frameworks/$CURR_VERSION.zip
echo Copied file!

Expand Down
6 changes: 2 additions & 4 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ analyzer:
exclude:
- "**.freezed.dart"
- "**.g.dart"
- packages/codde_protocol/lib/src/api/base # generated
- packages/codde_protocol/lib/src/frb_generated*.dart # generated
language:
# strict-inference: true
strict-raw-types: true
Expand All @@ -31,8 +33,6 @@ linter:
- empty_catches
- file_names
- hash_and_equals
- iterable_contains_unrelated_type
- list_remove_unrelated_type
- no_duplicate_case_values
- non_constant_identifier_names
- null_check_on_nullable_type_parameter
Expand All @@ -49,7 +49,6 @@ linter:
- void_checks

# Recommended Dart lints
- always_require_non_null_named_parameters
- annotate_overrides
- avoid_function_literals_in_foreach_calls
- avoid_init_to_null
Expand All @@ -76,7 +75,6 @@ linter:
- prefer_collection_literals
- prefer_conditional_assignment
- prefer_contains
- prefer_equal_for_default_values
- prefer_final_fields
- prefer_for_elements_to_map_fromIterable
- prefer_function_declarations_over_variables
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.30.

// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import, unused_element
// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import

import '../../frb_generated.dart';
import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,8 @@ class __$$ResultRegistry_ConfirmResultImplCopyWithImpl<$Res>

/// @nodoc
class _$ResultRegistry_ConfirmResultImpl
implements ResultRegistry_ConfirmResult {
const _$ResultRegistry_ConfirmResultImpl({required this.status});
class _$ResultRegistry_ConfirmResultImpl extends ResultRegistry_ConfirmResult {
const _$ResultRegistry_ConfirmResultImpl({required this.status}) : super._();

@override
final bool status;
Expand Down Expand Up @@ -204,9 +203,10 @@ class _$ResultRegistry_ConfirmResultImpl
}
}

abstract class ResultRegistry_ConfirmResult implements ResultRegistry {
abstract class ResultRegistry_ConfirmResult extends ResultRegistry {
const factory ResultRegistry_ConfirmResult({required final bool status}) =
_$ResultRegistry_ConfirmResultImpl;
const ResultRegistry_ConfirmResult._() : super._();

bool get status;
@JsonKey(ignore: true)
Expand Down Expand Up @@ -250,8 +250,8 @@ class __$$ResultRegistry_ErrorResultImplCopyWithImpl<$Res>

/// @nodoc
class _$ResultRegistry_ErrorResultImpl implements ResultRegistry_ErrorResult {
const _$ResultRegistry_ErrorResultImpl({required this.error});
class _$ResultRegistry_ErrorResultImpl extends ResultRegistry_ErrorResult {
const _$ResultRegistry_ErrorResultImpl({required this.error}) : super._();

@override
final String error;
Expand Down Expand Up @@ -342,9 +342,10 @@ class _$ResultRegistry_ErrorResultImpl implements ResultRegistry_ErrorResult {
}
}

abstract class ResultRegistry_ErrorResult implements ResultRegistry {
abstract class ResultRegistry_ErrorResult extends ResultRegistry {
const factory ResultRegistry_ErrorResult({required final String error}) =
_$ResultRegistry_ErrorResultImpl;
const ResultRegistry_ErrorResult._() : super._();

String get error;
@JsonKey(ignore: true)
Expand Down Expand Up @@ -458,8 +459,8 @@ class __$$WidgetRegistry_ClickButtonImplCopyWithImpl<$Res>

/// @nodoc
class _$WidgetRegistry_ClickButtonImpl implements WidgetRegistry_ClickButton {
const _$WidgetRegistry_ClickButtonImpl();
class _$WidgetRegistry_ClickButtonImpl extends WidgetRegistry_ClickButton {
const _$WidgetRegistry_ClickButtonImpl() : super._();

@override
String toString() {
Expand Down Expand Up @@ -565,8 +566,9 @@ class _$WidgetRegistry_ClickButtonImpl implements WidgetRegistry_ClickButton {
}
}

abstract class WidgetRegistry_ClickButton implements WidgetRegistry {
abstract class WidgetRegistry_ClickButton extends WidgetRegistry {
const factory WidgetRegistry_ClickButton() = _$WidgetRegistry_ClickButtonImpl;
const WidgetRegistry_ClickButton._() : super._();
}

/// @nodoc
Expand Down Expand Up @@ -605,8 +607,8 @@ class __$$WidgetRegistry_ToggleButtonImplCopyWithImpl<$Res>

/// @nodoc
class _$WidgetRegistry_ToggleButtonImpl implements WidgetRegistry_ToggleButton {
const _$WidgetRegistry_ToggleButtonImpl({required this.value});
class _$WidgetRegistry_ToggleButtonImpl extends WidgetRegistry_ToggleButton {
const _$WidgetRegistry_ToggleButtonImpl({required this.value}) : super._();

@override
final bool value;
Expand Down Expand Up @@ -723,9 +725,10 @@ class _$WidgetRegistry_ToggleButtonImpl implements WidgetRegistry_ToggleButton {
}
}

abstract class WidgetRegistry_ToggleButton implements WidgetRegistry {
abstract class WidgetRegistry_ToggleButton extends WidgetRegistry {
const factory WidgetRegistry_ToggleButton({required final bool value}) =
_$WidgetRegistry_ToggleButtonImpl;
const WidgetRegistry_ToggleButton._() : super._();

bool get value;
@JsonKey(ignore: true)
Expand Down Expand Up @@ -754,9 +757,8 @@ class __$$WidgetRegistry_ConfirmButtonImplCopyWithImpl<$Res>

/// @nodoc
class _$WidgetRegistry_ConfirmButtonImpl
implements WidgetRegistry_ConfirmButton {
const _$WidgetRegistry_ConfirmButtonImpl();
class _$WidgetRegistry_ConfirmButtonImpl extends WidgetRegistry_ConfirmButton {
const _$WidgetRegistry_ConfirmButtonImpl() : super._();

@override
String toString() {
Expand Down Expand Up @@ -862,9 +864,10 @@ class _$WidgetRegistry_ConfirmButtonImpl
}
}

abstract class WidgetRegistry_ConfirmButton implements WidgetRegistry {
abstract class WidgetRegistry_ConfirmButton extends WidgetRegistry {
const factory WidgetRegistry_ConfirmButton() =
_$WidgetRegistry_ConfirmButtonImpl;
const WidgetRegistry_ConfirmButton._() : super._();
}

/// @nodoc
Expand Down Expand Up @@ -902,8 +905,8 @@ class __$$WidgetRegistry_PressButtonImplCopyWithImpl<$Res>

/// @nodoc
class _$WidgetRegistry_PressButtonImpl implements WidgetRegistry_PressButton {
const _$WidgetRegistry_PressButtonImpl({required this.pressed});
class _$WidgetRegistry_PressButtonImpl extends WidgetRegistry_PressButton {
const _$WidgetRegistry_PressButtonImpl({required this.pressed}) : super._();

@override
final bool pressed;
Expand Down Expand Up @@ -1020,9 +1023,10 @@ class _$WidgetRegistry_PressButtonImpl implements WidgetRegistry_PressButton {
}
}

abstract class WidgetRegistry_PressButton implements WidgetRegistry {
abstract class WidgetRegistry_PressButton extends WidgetRegistry {
const factory WidgetRegistry_PressButton({required final bool pressed}) =
_$WidgetRegistry_PressButtonImpl;
const WidgetRegistry_PressButton._() : super._();

bool get pressed;
@JsonKey(ignore: true)
Expand Down Expand Up @@ -1067,8 +1071,9 @@ class __$$WidgetRegistry_DirectionalButtonImplCopyWithImpl<$Res>
/// @nodoc
class _$WidgetRegistry_DirectionalButtonImpl
implements WidgetRegistry_DirectionalButton {
const _$WidgetRegistry_DirectionalButtonImpl({required this.direction});
extends WidgetRegistry_DirectionalButton {
const _$WidgetRegistry_DirectionalButtonImpl({required this.direction})
: super._();

@override
final int direction;
Expand Down Expand Up @@ -1187,9 +1192,10 @@ class _$WidgetRegistry_DirectionalButtonImpl
}
}

abstract class WidgetRegistry_DirectionalButton implements WidgetRegistry {
abstract class WidgetRegistry_DirectionalButton extends WidgetRegistry {
const factory WidgetRegistry_DirectionalButton(
{required final int direction}) = _$WidgetRegistry_DirectionalButtonImpl;
const WidgetRegistry_DirectionalButton._() : super._();

int get direction;
@JsonKey(ignore: true)
Expand Down Expand Up @@ -1238,9 +1244,10 @@ class __$$WidgetRegistry_JoystickImplCopyWithImpl<$Res>

/// @nodoc
class _$WidgetRegistry_JoystickImpl implements WidgetRegistry_Joystick {
class _$WidgetRegistry_JoystickImpl extends WidgetRegistry_Joystick {
const _$WidgetRegistry_JoystickImpl(
{required this.delta, required this.intensity});
{required this.delta, required this.intensity})
: super._();

@override
final Coord delta;
Expand Down Expand Up @@ -1361,10 +1368,11 @@ class _$WidgetRegistry_JoystickImpl implements WidgetRegistry_Joystick {
}
}

abstract class WidgetRegistry_Joystick implements WidgetRegistry {
abstract class WidgetRegistry_Joystick extends WidgetRegistry {
const factory WidgetRegistry_Joystick(
{required final Coord delta,
required final double intensity}) = _$WidgetRegistry_JoystickImpl;
const WidgetRegistry_Joystick._() : super._();

Coord get delta;
double get intensity;
Expand Down
2 changes: 1 addition & 1 deletion packages/codde_protocol/lib/src/frb_generated.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.30.

// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field, prefer_is_empty
// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field

import 'api/base/error.dart';
import 'api/base/frame.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/codde_protocol/native/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ homepage = "https://github.com/codde-pi/codde_protocol"
[dependencies]
arr_macro = "0.2.1"
dynamic = "0.2.1"
pyo3 = {version ="0.21.1", features = ["anyhow", "serde", "abi3-py38", "gil-refs"]}
pyo3 = {version ="0.21.1", features = ["anyhow", "serde", "gil-refs"]} # "abi-py38",
quote = "1.0.35"
serde = {version= "1.0.196", features = ["derive"] }
syn = "2.0.48"
Expand Down
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"
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"
44 changes: 44 additions & 0 deletions packages/flutter_codde_protocol/example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '12.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!
use_modular_headers!

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
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"
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 packages/flutter_codde_protocol/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
Loading

0 comments on commit d3b9c40

Please sign in to comment.