Skip to content

Commit

Permalink
Merge pull request #306 from FaisalFaraj/master
Browse files Browse the repository at this point in the history
Fixes #303 - Add suport for Flutter 3.22 and Dart 3.4
  • Loading branch information
hhtokpinar authored Jul 8, 2024
2 parents 5ede09e + 123fdcb commit 7dd428f
Show file tree
Hide file tree
Showing 26 changed files with 644 additions and 673 deletions.
Binary file modified .DS_Store
Binary file not shown.
213 changes: 111 additions & 102 deletions .dart_tool/package_config.json

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions .github/FUNDING.yml

This file was deleted.

16 changes: 0 additions & 16 deletions .vscode/launch.json

This file was deleted.

2 changes: 1 addition & 1 deletion example/.flutter-plugins
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This is a generated file; do not edit or check into version control.
sqflite_sqlcipher=/Users/huseyintokpinar/.pub-cache/hosted/pub.dev/sqflite_sqlcipher-2.1.1+1/
sqflite_sqlcipher=/Users/huseyintokpunar/.pub-cache/hosted/pub.dev/sqflite_sqlcipher-2.2.1/
2 changes: 1 addition & 1 deletion example/.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":"sqflite_sqlcipher","path":"/Users/huseyintokpinar/.pub-cache/hosted/pub.dev/sqflite_sqlcipher-2.1.1+1/","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite_sqlcipher","path":"/Users/huseyintokpinar/.pub-cache/hosted/pub.dev/sqflite_sqlcipher-2.1.1+1/","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite_sqlcipher","path":"/Users/huseyintokpinar/.pub-cache/hosted/pub.dev/sqflite_sqlcipher-2.1.1+1/","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite_sqlcipher","dependencies":[]}],"date_created":"2023-07-15 19:15:49.072106","version":"3.10.4"}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite_sqlcipher","path":"/Users/huseyintokpunar/.pub-cache/hosted/pub.dev/sqflite_sqlcipher-2.2.1/","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite_sqlcipher","path":"/Users/huseyintokpunar/.pub-cache/hosted/pub.dev/sqflite_sqlcipher-2.2.1/","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite_sqlcipher","path":"/Users/huseyintokpunar/.pub-cache/hosted/pub.dev/sqflite_sqlcipher-2.2.1/","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite_sqlcipher","dependencies":[]}],"date_created":"2024-07-08 10:55:29.041373","version":"3.22.0"}
6 changes: 1 addition & 5 deletions example/analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
analyzer:
strong-mode:
#implicit-dynamic: false
implicit-dynamic: false

errors:

Expand Down Expand Up @@ -34,8 +34,6 @@ linter:
- empty_statements
- hash_and_equals
# - invariant_booleans # https://github.com/flutter/flutter/issues/5790
- iterable_contains_unrelated_type
- list_remove_unrelated_type
# - literal_only_boolean_expressions # https://github.com/flutter/flutter/issues/5791
- no_adjacent_strings_in_list
- no_duplicate_case_values
Expand All @@ -47,7 +45,6 @@ linter:
# === style rules ===
- always_declare_return_types
- always_put_control_body_on_new_line
- always_require_non_null_named_parameters
#- always_specify_types
- annotate_overrides
- use_function_type_syntax_for_parameters
Expand Down Expand Up @@ -91,7 +88,6 @@ linter:
- prefer_const_constructors
# - prefer_constructors_over_static_methods # not yet tested
- prefer_contains
- prefer_equal_for_default_values
# - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
- prefer_final_fields # https://github.com/dart-lang/linter/issues/506
- prefer_final_locals
Expand Down
9 changes: 4 additions & 5 deletions example/ios/Flutter/flutter_export_environment.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#!/bin/sh
# This is a generated file; do not edit or check into version control.
export "FLUTTER_ROOT=/Users/huseyintokpinar/Dev/flutter"
export "FLUTTER_APPLICATION_PATH=/Volumes/DEPO/Projeler/sqfEntity/example"
export "FLUTTER_ROOT=/Volumes/DEPO/SDK/flutter"
export "FLUTTER_APPLICATION_PATH=/Volumes/DEPO/Projeler/sqfEntity3/example"
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
export "FLUTTER_TARGET=/Volumes/DEPO/Projeler/sqfEntity/example/lib/main.dart"
export "FLUTTER_TARGET=lib/main.dart"
export "FLUTTER_BUILD_DIR=build"
export "FLUTTER_BUILD_NAME=1.3.0"
export "FLUTTER_BUILD_NUMBER=1.3.0"
export "DART_DEFINES=RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==,RkxVVFRFUl9XRUJfQ0FOVkFTS0lUX1VSTD1odHRwczovL3d3dy5nc3RhdGljLmNvbS9mbHV0dGVyLWNhbnZhc2tpdC8yYTM0MDFjOWJiYjVhOWE5YWVjNzRkNGY3MzVkMThhOWRkM2ViZjJkLw=="
export "DART_OBFUSCATION=false"
export "TRACK_WIDGET_CREATION=true"
export "TREE_SHAKE_ICONS=false"
export "PACKAGE_CONFIG=/Volumes/DEPO/Projeler/sqfEntity/example/.dart_tool/package_config.json"
export "PACKAGE_CONFIG=.dart_tool/package_config.json"
75 changes: 50 additions & 25 deletions example/ios/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@ packages:
dependency: transitive
description:
name: collection
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev"
source: hosted
version: "1.17.1"
version: "1.18.0"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
url: "https://pub.dev"
source: hosted
version: "1.0.5"
version: "1.0.8"
fake_async:
dependency: transitive
description:
Expand All @@ -67,46 +67,62 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
js:
leak_tracker:
dependency: transitive
description:
name: js
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
name: leak_tracker
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev"
source: hosted
version: "0.6.7"
version: "10.0.4"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev"
source: hosted
version: "3.0.3"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
matcher:
dependency: transitive
description:
name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.15"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.12.0"
path:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
sky_engine:
dependency: transitive
description: flutter
Expand All @@ -116,26 +132,26 @@ packages:
dependency: transitive
description:
name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.10.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
version: "1.11.0"
version: "1.11.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
string_scanner:
dependency: transitive
description:
Expand All @@ -156,10 +172,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev"
source: hosted
version: "0.5.1"
version: "0.7.0"
vector_math:
dependency: transitive
description:
Expand All @@ -168,5 +184,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
vm_service:
dependency: transitive
description:
name: vm_service
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.dev"
source: hosted
version: "14.2.1"
sdks:
dart: ">=3.0.0-0 <4.0.0"
dart: ">=3.3.0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
2 changes: 1 addition & 1 deletion example/lib/sample_advanced_form/productList.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:sqfentity_example/tools/slidemenu.dart';
import 'package:sqfentity_gen/sqfentity_gen.dart';

import '../model/model.dart';
import '../tools/helper.dart';
import '../tools/slideMenu.dart';
import 'productDetail.dart';
import 'productFilterWindow.dart';
import 'searchFilters.dart';
Expand Down
Loading

0 comments on commit 7dd428f

Please sign in to comment.