Skip to content

Commit e1085c4

Browse files
authored
⬆️ Roll deps (#319)
1 parent af0eb9e commit e1085c4

File tree

9 files changed

+35
-34
lines changed

9 files changed

+35
-34
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
publish:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v6
1313
- uses: k-paxian/dart-package-publisher@master
1414
with:
1515
credentialJson: ${{ secrets.CREDENTIAL_JSON }}

.github/workflows/publishable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Publish dry-run with packages
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v6
2121
- uses: k-paxian/dart-package-publisher@master
2222
with:
2323
credentialJson: 'MockCredentialJson'

.github/workflows/runnable.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
matrix:
1818
os: [ubuntu-latest]
1919
steps:
20-
- uses: actions/checkout@v3
21-
- uses: actions/setup-java@v3
20+
- uses: actions/checkout@v6
21+
- uses: actions/setup-java@v5
2222
with:
2323
distribution: 'zulu'
2424
java-version: '17'
25-
- uses: subosito/flutter-action@v2
25+
- uses: flutter-actions/setup-flutter@v4
2626
with:
2727
channel: 'stable'
2828
- run: dart --version
@@ -38,14 +38,13 @@ jobs:
3838
matrix:
3939
os: [macos-latest]
4040
steps:
41-
- uses: actions/checkout@v3
42-
- uses: actions/setup-java@v3
41+
- uses: actions/checkout@v6
42+
- uses: actions/setup-java@v5
4343
with:
4444
distribution: 'zulu'
4545
java-version: '17'
46-
- uses: subosito/flutter-action@v2
46+
- uses: flutter-actions/setup-flutter@v4
4747
with:
48-
architecture: x64
4948
channel: 'stable'
5049
- run: dart --version
5150
- run: flutter --version
@@ -60,12 +59,12 @@ jobs:
6059
matrix:
6160
os: [ubuntu-latest]
6261
steps:
63-
- uses: actions/checkout@v3
64-
- uses: actions/setup-java@v3
62+
- uses: actions/checkout@v6
63+
- uses: actions/setup-java@v5
6564
with:
6665
distribution: 'zulu'
6766
java-version: '17'
68-
- uses: subosito/flutter-action@v2
67+
- uses: flutter-actions/setup-flutter@v4
6968
with:
7069
channel: 'stable'
7170
- run: dart --version

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ See the [Migration Guide](guides/migration_guide.md) for breaking changes betwee
88

99
## Unreleased
1010

11-
*None.*
11+
### New features
12+
13+
- Allows `camera 0.11+` (including 0.12).
14+
- Allows `sensor_plus 7.0`.
1215

1316
## 4.4.0
1417

example/android/app/build.gradle

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "com.android.application"
3-
id "kotlin-android"
4-
id "kotlin-kapt"
3+
id "org.jetbrains.kotlin.android"
4+
id 'org.jetbrains.kotlin.kapt'
55
id "dev.flutter.flutter-gradle-plugin"
66
}
77

@@ -26,16 +26,16 @@ if (flutterVersionName == null) {
2626
android {
2727
namespace "com.fluttercandies.wechatCameraPickerExample"
2828

29-
compileSdkVersion 34
29+
compileSdk = flutter.compileSdkVersion
3030

3131
sourceSets {
3232
main.java.srcDirs += 'src/main/kotlin'
3333
}
3434

3535
defaultConfig {
3636
applicationId "com.fluttercandies.wechatCameraPickerExample"
37-
minSdkVersion 21
38-
targetSdkVersion 34
37+
minSdkVersion flutter.minSdkVersion
38+
targetSdkVersion flutter.targetSdkVersion
3939
versionCode flutterVersionCode.toInteger()
4040
versionName flutterVersionName
4141
}
@@ -70,13 +70,17 @@ android {
7070
signingConfig signingConfigs.forAll
7171
}
7272
}
73+
74+
lint {
75+
disable 'InvalidPackage'
76+
}
7377
}
7478

7579
flutter {
7680
source '../..'
7781
}
7882

7983
dependencies {
80-
implementation 'com.github.bumptech.glide:glide:4.15.0'
81-
kapt 'com.github.bumptech.glide:compiler:4.15.0'
84+
implementation 'com.github.bumptech.glide:glide:4.16.0'
85+
kapt 'com.github.bumptech.glide:compiler:4.16.0'
8286
}

example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Fri Jun 23 08:50:38 CEST 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip

example/android/settings.gradle

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
// Copyright 2014 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-
51
pluginManagement {
62
def flutterSdkPath = {
73
def properties = new Properties()
84
file("local.properties").withInputStream { properties.load(it) }
95
def flutterSdkPath = properties.getProperty("flutter.sdk")
106
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
117
return flutterSdkPath
12-
}
13-
settings.ext.flutterSdkPath = flutterSdkPath()
8+
}()
149

15-
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
1611

1712
repositories {
1813
google()
@@ -23,8 +18,9 @@ pluginManagement {
2318

2419
plugins {
2520
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
26-
id "com.android.application" version "8.2.2" apply false
27-
id "org.jetbrains.kotlin.android" version "1.9.20" apply false
21+
id "com.android.application" version "8.13.0" apply false
22+
id "org.jetbrains.kotlin.android" version "2.2.0" apply false
23+
id "org.jetbrains.kotlin.kapt" version "2.2.0" apply false
2824
}
2925

3026
include ":app"

pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ dependencies:
2424

2525
wechat_picker_library: ^1.0.7
2626

27-
camera: ^0.10.0
27+
camera: '>=0.10.0 <0.13.0'
2828
camera_android: ^0.10.9+6
2929
camera_platform_interface: ^2.1.5
3030

3131
collection: ^1.18.0
3232
path: ^1.8.0
3333
photo_manager: ^3.2.3
3434
photo_manager_image_provider: ^2.0.0
35-
sensors_plus: '>=4.0.0 <7.0.0'
35+
sensors_plus: '>=4.0.0 <8.0.0'
3636
video_player: ^2.7.0
3737

3838
dev_dependencies:

0 commit comments

Comments
 (0)