From 9f63be0cd45d7eb1eac76f97b40d1cac017c7971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=8D=93=E5=8E=9F?= Date: Wed, 15 May 2024 18:28:46 +0800 Subject: [PATCH] v5.9.0 --- .github/workflows/actions.yml | 35 ++++++++++--------- CHANGELOG.md | 4 +++ example/android/app/build.gradle | 2 +- .../ios/Flutter/flutter_export_environment.sh | 5 ++- example/lib/src/first_method.dart | 3 +- lib/src/screenutil_init.dart | 4 +-- pubspec.yaml | 2 +- 7 files changed, 30 insertions(+), 25 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index d2591b2..8daa1fc 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -1,22 +1,23 @@ -name: Close inactive issues +# .github/workflows/publish.yml +name: Publish to pub.dev + on: - schedule: - - cron: "30 1 * * *" + push: + tags: + - 'v[0-9]+.[0-9]+.[0-9]+*' # tag pattern on pub.dev: 'v' +# Publish using custom workflow jobs: - close-issues: - runs-on: ubuntu-latest + publish: permissions: - issues: write - pull-requests: write + id-token: write # Required for authentication using OIDC + runs-on: ubuntu-latest steps: - - uses: actions/stale@v3 - with: - days-before-issue-stale: 30 - days-before-issue-close: 14 - stale-issue-label: "stale" - stale-issue-message: "This issue is stale because it has been open for 30 days with no activity." - close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale." - days-before-pr-stale: -1 - days-before-pr-close: -1 - repo-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + - uses: actions/checkout@v3 + - uses: dart-lang/setup-dart@v1 + - name: Install dependencies + run: dart pub get + # Here you can insert custom steps you need + # - run: dart tool/generate-code.dart + - name: Publish + run: dart pub publish --force \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index a22f0a2..05d3e18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 5.9.1 +- merge pr #550 #555 #556 +- update readme + # 5.9.0 - ScreenUtilInit won't rebuild the whole widget tree - Add `fontSizeResolver` to specify how font size should be scaled diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index a8195c3..924ea8d 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -39,7 +39,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "li.zhuoyuan.example" - minSdkVersion 16 + minSdkVersion flutter.minSdkVersion targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh index eae3356..4a3c589 100755 --- a/example/ios/Flutter/flutter_export_environment.sh +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -3,12 +3,11 @@ export "FLUTTER_ROOT=/Users/lizhuoyuan/fvm/versions/stable" export "FLUTTER_APPLICATION_PATH=/Users/lizhuoyuan/Development/Project/flutter_screenutil/example" export "COCOAPODS_PARALLEL_CODE_SIGN=true" -export "FLUTTER_TARGET=/Users/lizhuoyuan/Development/Project/flutter_screenutil/example/lib/main.dart" +export "FLUTTER_TARGET=lib/main.dart" export "FLUTTER_BUILD_DIR=build" export "FLUTTER_BUILD_NAME=1.0.0" export "FLUTTER_BUILD_NUMBER=1" -export "DART_DEFINES=Zmx1dHRlci5pbnNwZWN0b3Iuc3RydWN0dXJlZEVycm9ycz10cnVl,RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==,RkxVVFRFUl9XRUJfQ0FOVkFTS0lUX1VSTD1odHRwczovL3d3dy5nc3RhdGljLmNvbS9mbHV0dGVyLWNhbnZhc2tpdC9jZGJlZGE3ODhhMjkzZmEyOTY2NWRjM2ZhM2Q2ZTYzYmQyMjFjYjBkLw==" export "DART_OBFUSCATION=false" export "TRACK_WIDGET_CREATION=true" export "TREE_SHAKE_ICONS=false" -export "PACKAGE_CONFIG=/Users/lizhuoyuan/Development/Project/flutter_screenutil/example/.dart_tool/package_config.json" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/example/lib/src/first_method.dart b/example/lib/src/first_method.dart index bd80d30..12150f8 100644 --- a/example/lib/src/first_method.dart +++ b/example/lib/src/first_method.dart @@ -1,8 +1,9 @@ import 'package:example/responsive_widgets.su.dart'; -import 'package:example/src/home.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import '../src_zh/home.dart'; + class MyApp extends StatelessWidget { const MyApp({Key? key}) : super(key: key); diff --git a/lib/src/screenutil_init.dart b/lib/src/screenutil_init.dart index a2fa03c..a9af5c8 100644 --- a/lib/src/screenutil_init.dart +++ b/lib/src/screenutil_init.dart @@ -2,10 +2,10 @@ import 'dart:async'; import 'dart:collection'; import 'package:flutter/widgets.dart'; -import './_flutter_widgets.dart'; -import 'screenutil_mixin.dart'; +import './_flutter_widgets.dart'; import 'screen_util.dart'; +import 'screenutil_mixin.dart'; typedef RebuildFactor = bool Function(MediaQueryData old, MediaQueryData data); diff --git a/pubspec.yaml b/pubspec.yaml index 6bc508c..9abb983 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_screenutil description: A flutter plugin for adapting screen and font size.Guaranteed to look good on different models -version: 5.9.0 +version: 5.9.1 homepage: https://github.com/OpenFlutter/flutter_screenutil environment: