Skip to content

Commit

Permalink
chore: update pkg
Browse files Browse the repository at this point in the history
  • Loading branch information
hungnt committed Mar 25, 2024
1 parent c5ccfca commit 647efd8
Show file tree
Hide file tree
Showing 13 changed files with 92 additions and 61 deletions.
2 changes: 1 addition & 1 deletion ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '11.0'
# platform :ios, '12.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
9 changes: 5 additions & 4 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
331C8080294A63A400263BE5 = {
Expand Down Expand Up @@ -452,7 +452,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand All @@ -478,6 +478,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.example.erbFlutterBoilerplatee;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -581,7 +582,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -630,7 +631,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
6 changes: 3 additions & 3 deletions lib/constants/app_glob_setting.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import 'package:env/env.dart';
class AppGlobalSetting {
const AppGlobalSetting._();

static final baseUrl = EnvFlavor().baseUrl;
static final baseUrl = EnvFlavor().baseUrl ?? '';

static final tmdbUrl = EnvFlavor().tmdbUrl;
static final tmdbUrl = EnvFlavor().tmdbUrl ?? '';

static final tmdbImg = EnvFlavor().tmdbImg;
static final tmdbImg = EnvFlavor().tmdbImg ?? '';
}
4 changes: 2 additions & 2 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Future<void> main() async {
final container = await mainInitializer();

runApp(
ProviderScope(
parent: container,
UncontrolledProviderScope(
container: container,
child: ResponsiveBreakpoints.builder(
breakpoints: const [
Breakpoint(start: 0, end: 450, name: MOBILE),
Expand Down
8 changes: 4 additions & 4 deletions packages/env/lib/src/env/env_fields.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/// All Env classes must implement all these values
abstract class EnvFields {
// TODO: Add non-static fields here and in the class for each flavor: [AppEnv], [DevEnv], [LocalEnv], [ProdEnv], and [StagingEnv]
abstract final String baseUrl;
abstract final String tmdbUrl;
abstract final String tmdbImg;
abstract final String tmdbToken;
abstract final String? baseUrl;
abstract final String? tmdbUrl;
abstract final String? tmdbImg;
abstract final String? tmdbToken;
}
2 changes: 1 addition & 1 deletion packages/env/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dev_dependencies:
build_runner: ^2.4.8
envied_generator: ^0.5.3
flutter_flavor: ^3.1.3
firebase_core: ^2.25.4
firebase_core: ^2.27.1

flutter_test:
sdk: flutter
Expand Down
8 changes: 4 additions & 4 deletions packages/erb_infinite_scroll/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ environment:
dependencies:
flutter:
sdk: flutter
flutter_riverpod: ^2.4.9
flutter_riverpod: ^2.5.1
infinite_scroll_pagination: ^4.0.0
collection: ^1.18.0
skeletonizer: 1.0.1
skeletonizer: 1.1.1

dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^3.0.1
riverpod_annotation: ^2.3.3
riverpod_generator: ^2.3.9
riverpod_annotation: ^2.3.5
riverpod_generator: ^2.4.0

flutter:
4 changes: 4 additions & 0 deletions packages/erb_ui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## NEXT_VERSION

### Features

- Add `prop` opacityDisabled `ERbButton`

## 0.0.3

### Features
Expand Down
4 changes: 3 additions & 1 deletion packages/erb_ui/lib/src/widgets/erb_elevated_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:flutter/material.dart';

import '_const/position.dart';

@Deprecated("Use ERbButton instead.")
class ERbElevatedButton extends StatefulWidget {
const ERbElevatedButton({
this.onPressed,
Expand Down Expand Up @@ -131,7 +132,8 @@ class _ERbElevatedButtonState extends State<ERbElevatedButton> {
child: Ink(
decoration: BoxDecoration(
borderRadius: _borderRadius,
gradient: widget.enableGradient && !btnDisabled ? gradientColor : null,
gradient:
widget.enableGradient && !btnDisabled ? gradientColor : null,
),
child: Container(
width: buttonWidth(),
Expand Down
48 changes: 36 additions & 12 deletions packages/erb_ui/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.2"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints:
dependency: transitive
description:
Expand All @@ -118,34 +142,34 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.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 Down Expand Up @@ -223,14 +247,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
web:
vm_service:
dependency: transitive
description:
name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "0.3.0"
version: "13.0.0"
sdks:
dart: ">=3.2.0 <4.0.0"
flutter: ">=1.17.0"
54 changes: 27 additions & 27 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: ">=3.1.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
flutter:
Expand All @@ -17,21 +17,21 @@ dependencies:
cupertino_icons: ^1.0.6

# logger
talker_flutter: ^4.0.2
talker_dio_logger: ^4.0.2
talker_flutter: ^4.1.0
talker_dio_logger: ^4.1.0

# dart utils
dio: ^5.4.1
dio_smart_retry: ^6.0.0
fpdart: ^1.1.0
fast_immutable_collections: ^9.2.1
fast_immutable_collections: ^10.2.1
retrofit: ^4.1.0
dart_mappable: ^4.2.0
internet_connection_checker_plus: ^2.2.0
dart_mappable: ^4.2.1
internet_connection_checker_plus: ^2.3.0

# i18n
slang: ^3.29.0
slang_flutter: ^3.29.0
slang: ^3.30.1
slang_flutter: ^3.30.0
#https://github.com/flutter/flutter/issues/139861
intl: ^0.18.1

Expand All @@ -40,35 +40,35 @@ dependencies:
hive_flutter: ^1.1.0

# flutter utils
hooks_riverpod: ^2.4.10
hooks_riverpod: ^2.5.1
flutter_hooks: ^0.20.5
auto_route: ^7.8.4
auto_route: ^7.9.2
url_launcher: ^6.2.5
permission_handler: ^11.3.0
local_auth: ^2.1.7
local_auth: ^2.2.0
flutter_flavor: ^3.1.3
app_settings: ^5.1.1
responsive_framework: ^1.1.1
responsive_framework: ^1.4.0
flutter_cache_manager: ^3.3.1
flutter_screenutil: ^5.9.0
flutter_secure_storage: ^9.0.0
flutter_local_notifications: ^16.3.2
flutter_local_notifications: ^17.0.0

# Device Identification
device_info_plus: ^9.1.2
package_info_plus: ^5.0.1
device_info_plus: ^10.0.1
package_info_plus: ^6.0.0
android_id: ^0.3.6

# flutter widgets
cached_network_image: ^3.3.1
infinite_scroll_pagination: ^4.0.0

# Firebase service
firebase_core: ^2.25.4
firebase_messaging: ^14.7.16
firebase_core: ^2.27.1
firebase_messaging: ^14.7.20

# annotations
riverpod_annotation: ^2.3.4
riverpod_annotation: ^2.3.5
reactive_forms_annotations: ^4.3.0

# Mock
Expand All @@ -91,25 +91,25 @@ dev_dependencies:
flutter_test:
sdk: flutter
# workflow
melos: ^4.1.0
melos: ^5.2.1
change_app_package_name: ^1.1.0
flutter_native_splash: ^2.3.9
flutter_native_splash: ^2.4.0

flutter_lints: ^3.0.1
custom_lint: ^0.5.8
riverpod_lint: ^2.3.7
custom_lint: ^0.6.4
riverpod_lint: ^2.3.10

# generators
riverpod_generator: ^2.3.9
riverpod_generator: ^2.4.0
build_runner: ^2.4.8
slang_build_runner: ^3.29.0
slang_build_runner: ^3.30.0
auto_route_generator: ^7.3.2
retrofit_generator: ^8.1.0
reactive_forms_generator: ^4.5.2
hive_generator: ^2.0.1
dart_mappable_builder: ^4.2.0
husky: 0.1.6
lint_staged: 0.5.0
dart_mappable_builder: ^4.2.1
husky: 0.1.7
lint_staged: 0.5.1

lint_staged:
"*/**.dart": dart format --fix
Expand Down

0 comments on commit 647efd8

Please sign in to comment.