Merge branch 'release/2.5.0'

.github/workflows/flutter.yml

@@ -7,11 +7,10 @@ on:
     branches:
     - develop
     - master
-    - 2x
+    - release/*
   pull_request:
     branches:
       - develop
-      - 2x
 
 jobs:
   build:
@@ -27,8 +26,8 @@ jobs:
     # Setup the flutter environment.
     - uses: subosito/flutter-action@v1
       with:
-        #channel: 'stable' # 'dev', 'alpha', default to: 'stable'
-        flutter-version: '1.22.x' # you can also specify exact version of flutter
+        channel: 'stable' # 'dev', 'alpha', default to: 'stable'
+        # flutter-version: '1.22.x' # you can also specify exact version of flutter
 
     # Get flutter dependencies.
     - run: flutter pub get

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.5.0 [2022-04-08]
+* 更新 Android SDK `v4.460.1330`
+* 以后将不在维护非 1x 版本，请及时升级
+
 ## 2.4.1 [2021-12-07]
 * 修复 iOS 编译问题
 

README.md

@@ -4,10 +4,9 @@
 <h3 align="center">一款优质的 Flutter 广告插件（腾讯广告、广点通、优量汇）</h3>
 
 <p align="center">
-<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/version-v1.5.0-success></a>
-<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/null_safety-v2.4.1-success></a>
+<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/pub-v2.5.0-success></a>
 <a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/platform-iOS%20%7C%20Android-brightgreen></a>
-<a href="https://github.com/FlutterAds/flutter_qq_ads/actions/workflows/flutter.yml"><img src="https://github.com/FlutterAds/flutter_qq_ads/actions/workflows/flutter.yml/badge.svg?branch=2x"></a>
+<a href="https://github.com/FlutterAds/flutter_qq_ads/actions/workflows/flutter.yml"><img src="https://github.com/FlutterAds/flutter_qq_ads/actions/workflows/flutter.yml/badge.svg"></a>
 <a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/github/stars/FlutterAds/flutter_qq_ads?color=brightgreen></a>
 <a href="https://github.com/FlutterAds/flutter_qq_ads/blob/develop/LICENSE"><img src=https://img.shields.io/badge/license-MIT-brightgreen></a>
 </p>
@@ -37,8 +36,7 @@
 
 ``` Dart
 dependencies:
-  flutter_qq_ads: ^1.5.0 # 非 Null Safety 版本
-  flutter_qq_ads: ^2.4.1 # Null Safety 版本
+  flutter_qq_ads: ^2.5.0
 ```
 
 ### 初始化广告
@@ -289,8 +287,8 @@ pod install
 |分支|说明|
 |-|-|
 |develop|开发分支，接受 PR|
-|master|稳定分支，非 Null Safety|
-|2x|稳定分支，Null Safety|
+|master|稳定分支，空安全|
+|1x|已不更新，非空安全|
 
 ## 更新日志
 [查看 Releases 版本日志](https://github.com/FlutterAds/flutter_qq_ads/releases)