Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 91bdd12

Browse files
Merge branch 'main' into url-launcher-full-federation
2 parents 4316337 + 1e85f32 commit 91bdd12

File tree

23 files changed

+68
-20
lines changed

23 files changed

+68
-20
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
- [ ] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. `[shared_preferences]`
1414
- [ ] I listed at least one issue that this PR fixes in the description above.
1515
- [ ] I updated `pubspec.yaml` with an appropriate new version according to the [pub versioning philosophy], or this PR is [exempt from version changes].
16-
- [ ] I updated `CHANGELOG.md` to add a description of the change.
16+
- [ ] I updated `CHANGELOG.md` to add a description of the change, [following repository CHANGELOG style].
1717
- [ ] I updated/added relevant documentation (doc comments with `///`).
1818
- [ ] I added new tests to check the change I am making, or this PR is [test-exempt].
1919
- [ ] All existing and new tests are passing.
@@ -30,5 +30,6 @@ If you need help, consider asking for advice on the #hackers-new channel on [Dis
3030
[Discord]: https://github.com/flutter/flutter/wiki/Chat
3131
[pub versioning philosophy]: https://dart.dev/tools/pub/versioning
3232
[exempt from version changes]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#version-and-changelog-updates
33+
[following repository CHANGELOG style]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changelog-style
3334
[the auto-formatter]: https://github.com/flutter/plugins/blob/master/script/tool/README.md#format-code
3435
[test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests

packages/camera/camera/CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
## 0.9.4+3
1+
## 0.9.4+4
22

33
* Change Android compileSdkVersion to 31.
44
* Remove usages of deprecated Android API `CamcorderProfile`.
55
* Update gradle version to 7.0.2 on Android.
6+
7+
## 0.9.4+3
8+
69
* Fix registerTexture and result being called on background thread on iOS.
710

811
## 0.9.4+2

packages/camera/camera/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
44
Dart.
55
repository: https://github.com/flutter/plugins/tree/master/packages/camera/camera
66
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
7-
version: 0.9.4+3
7+
version: 0.9.4+4
88

99
environment:
1010
sdk: ">=2.14.0 <3.0.0"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.7
2+
3+
* Fixes link in README.
4+
15
## 2.0.6
26

37
* Split from `path_provider` as a federated implementation.

packages/path_provider/path_provider_android/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# path\_provider\_android
22

3-
The Android implementation of [`path_provider`].
3+
The Android implementation of [`path_provider`][1].
44

55
## Usage
66

packages/path_provider/path_provider_android/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: path_provider_android
22
description: Android implementation of the path_provider plugin.
33
repository: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22
5-
version: 2.0.6
5+
version: 2.0.7
66

77
environment:
88
sdk: ">=2.14.0 <3.0.0"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.7
2+
3+
* Fixes link in README.
4+
15
## 2.0.6
26

37
* Split from `path_provider` as a federated implementation.

packages/path_provider/path_provider_ios/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# path\_provider\_ios
22

3-
The iOS implementation of [`path_provider`].
3+
The iOS implementation of [`path_provider`][1].
44

55
## Usage
66

packages/path_provider/path_provider_ios/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: path_provider_ios
22
description: iOS implementation of the path_provider plugin.
33
repository: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_ios
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22
5-
version: 2.0.6
5+
version: 2.0.7
66

77
environment:
88
sdk: ">=2.14.0 <3.0.0"

packages/path_provider/path_provider_linux/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.1.2
2+
3+
* Fixes link in README.
4+
15
## 2.1.1
26

37
* Removed obsolete `pluginClass: none` from pubpsec.
@@ -46,5 +50,5 @@
4650
* This updates the readme and pubspec and example to reflect the endorsement of this implementation of `path_provider`
4751

4852
## 0.0.1
49-
* The initial implementation of path_provider for Linux
53+
* The initial implementation of path\_provider for Linux
5054
* Implements getApplicationSupportPath, getApplicationDocumentsPath, getDownloadsPath, and getTemporaryPath

packages/path_provider/path_provider_linux/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# path\_provider\_linux
22

3-
The linux implementation of [`path_provider`].
3+
The linux implementation of [`path_provider`][1].
44

55
## Usage
66

packages/path_provider/path_provider_linux/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: path_provider_linux
22
description: Linux implementation of the path_provider plugin
33
repository: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_linux
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22
5-
version: 2.1.1
5+
version: 2.1.2
66

77
environment:
88
sdk: ">=2.12.0 <3.0.0"

packages/path_provider/path_provider_macos/CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# 2.0.2
1+
## 2.0.3
2+
3+
* Fixes link in README.
4+
5+
## 2.0.2
26

37
* Add Swift language version to podspec.
48
* Add native unit tests.
@@ -55,7 +59,7 @@
5559

5660
## 0.0.3+1
5761

58-
* Make the pedantic dev_dependency explicit.
62+
* Make the pedantic `dev_dependency` explicit.
5963

6064
## 0.0.3
6165

packages/path_provider/path_provider_macos/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# path\_provider\_macos
22

3-
The macos implementation of [`path_provider`].
3+
The macos implementation of [`path_provider`][1].
44

55
## Usage
66

packages/path_provider/path_provider_macos/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: path_provider_macos
22
description: macOS implementation of the path_provider plugin
33
repository: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_macos
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22
5-
version: 2.0.2
5+
version: 2.0.3
66

77
environment:
88
sdk: ">=2.12.0 <3.0.0"

packages/url_launcher/url_launcher/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
* Moves Android and iOS implementations to federated packages.
44

5+
## 6.0.13
6+
7+
* Fixed extracting browser headers when they are null error.
8+
59
## 6.0.12
610

711
* Fixed an error where 'launch' method of url_launcher would cause an error if the provided URL was not valid by RFC 3986.

packages/url_launcher/url_launcher/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL. Supports
33
web, phone, SMS, and email schemes.
44
repository: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher
55
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
6-
version: 6.0.12
6+
version: 6.0.13
77
# Temporarily disable publishing to allow moving Android and iOS
88
# implementations.
99
publish_to: none
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
## 6.0.12
1+
## 6.0.13
22

33
* Splits from `shared_preferences` as a federated implementation.

packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/WebViewActivity.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
import android.webkit.WebView;
2121
import android.webkit.WebViewClient;
2222
import androidx.annotation.NonNull;
23+
import androidx.annotation.Nullable;
2324
import androidx.annotation.RequiresApi;
25+
import androidx.annotation.VisibleForTesting;
26+
import java.util.Collections;
2427
import java.util.HashMap;
2528
import java.util.Map;
2629

@@ -142,7 +145,11 @@ public void onCreate(Bundle savedInstanceState) {
142145
registerReceiver(broadcastReceiver, closeIntentFilter);
143146
}
144147

145-
private Map<String, String> extractHeaders(Bundle headersBundle) {
148+
@VisibleForTesting
149+
public static Map<String, String> extractHeaders(@Nullable Bundle headersBundle) {
150+
if (headersBundle == null) {
151+
return Collections.emptyMap();
152+
}
146153
final Map<String, String> headersMap = new HashMap<>();
147154
for (String key : headersBundle.keySet()) {
148155
final String value = headersBundle.getString(key);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
package io.flutter.plugins.urllauncher;
6+
7+
import static org.junit.Assert.assertEquals;
8+
9+
import java.util.Collections;
10+
import org.junit.Test;
11+
12+
public class WebViewActivityTest {
13+
@Test
14+
public void extractHeaders_returnsEmptyMapWhenHeadersBundleNull() {
15+
assertEquals(WebViewActivity.extractHeaders(null), Collections.emptyMap());
16+
}
17+
}

packages/url_launcher/url_launcher_android/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: url_launcher_android
22
description: Android implementation of the url_launcher plugin.
33
repository: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
5-
version: 6.0.12
5+
version: 6.0.13
66

77
environment:
88
sdk: ">=2.14.0 <3.0.0"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
## 6.0.12
1+
## 6.0.13
22

33
* Splits from `url_launcher` as a federated implementation.

packages/url_launcher/url_launcher_ios/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: url_launcher_ios
22
description: iOS implementation of the url_launcher plugin.
33
repository: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_ios
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
5-
version: 6.0.12
5+
version: 6.0.13
66

77
environment:
88
sdk: ">=2.14.0 <3.0.0"

0 commit comments

Comments
 (0)