diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42d7ea80f957..7c0b45fd84e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: with: java-version: "17" distribution: "temurin" - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - name: 📦 Get dependencies @@ -97,7 +97,7 @@ jobs: uses: actions/checkout@v4 - name: Make yq tool available on Windows runners run: choco install yq - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - name: ✅ Enable platforms @@ -171,7 +171,7 @@ jobs: libsecret-1-dev \ libjsoncpp-dev \ rpm - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - name: ✅ Enable platforms @@ -277,7 +277,7 @@ jobs: alien \ libsecret-1-dev \ libjsoncpp-dev - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - name: ✅ Enable platforms @@ -336,7 +336,7 @@ jobs: steps: - name: ⬆️ Checkout uses: actions/checkout@v4 - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - uses: actions/setup-python@v5 @@ -388,7 +388,7 @@ jobs: steps: - name: ⬆️ Checkout uses: actions/checkout@v4 - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - name: 📦 Get dependencies @@ -645,7 +645,7 @@ jobs: with: java-version: "17" distribution: "temurin" - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - name: 📦 Get dependencies @@ -654,7 +654,7 @@ jobs: - name: Setup Fastlane uses: ruby/setup-ruby@v1 with: - ruby-version: "3.3.5" + ruby-version: "3.3.6" bundler-cache: true working-directory: app/android - name: 🚀 Deploy to Play Store diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 5f99d5f68b00..9c8cbdeb463b 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -14,7 +14,7 @@ jobs: steps: - name: ⬆️ Checkout uses: actions/checkout@v4 - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - uses: actions/checkout@v4 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5ac0cda55ef9..e18e66cee240 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -50,7 +50,7 @@ jobs: steps: - name: ⬆️ Checkout uses: actions/checkout@v4 - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - name: Install dependencies diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f2d62eb1bde7..2c8bb3a3b9bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: with: token: ${{ secrets.CI_PAT }} fetch-depth: 0 - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - name: Setup git @@ -65,7 +65,7 @@ jobs: token: ${{ secrets.CI_PAT }} ref: ${{ github.ref }} fetch-depth: 0 - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - name: Setup git @@ -127,7 +127,7 @@ jobs: with: token: ${{ secrets.CI_PAT }} fetch-depth: 0 - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - name: Setup git @@ -190,7 +190,7 @@ jobs: echo "BUTTERFLY_BUILD_NUMBER=${BUTTERFLY_BUILD_NUMBER}" >> $GITHUB_ENV git config --global user.email "ci@linwood.dev" git config --global user.name "Linwood CI" - - uses: subosito/flutter-action@v2.17.0 + - uses: subosito/flutter-action@v2.18.0 with: flutter-version-file: app/pubspec.yaml - name: Bump version diff --git a/api/pubspec.lock b/api/pubspec.lock index 7c446cc2c14b..460bc8880197 100644 --- a/api/pubspec.lock +++ b/api/pubspec.lock @@ -162,10 +162,10 @@ packages: dependency: transitive description: name: coverage - sha256: "4b03e11f6d5b8f6e5bb5e9f7889a56fe6c5cbe942da5378ea4d4d7f73ef9dfe5" + sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43 url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" crypto: dependency: transitive description: @@ -547,10 +547,10 @@ packages: dependency: "direct dev" description: name: test - sha256: f2a018e2baa6fce7c8daa55b8bdf4b3d7d165f82caac269e4cbe5edd666c0e4c + sha256: "22eb7769bee38c7e032d532e8daa2e1cc901b799f603550a4db8f3a5f5173ea2" url: "https://pub.dev" source: hosted - version: "1.25.9" + version: "1.25.12" test_api: dependency: transitive description: @@ -563,10 +563,10 @@ packages: dependency: transitive description: name: test_core - sha256: "60ff490bb383858015df7b7a0d883301a426edf9033989f55f091d91efb9dfaf" + sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa" url: "https://pub.dev" source: hosted - version: "0.6.6" + version: "0.6.8" timing: dependency: transitive description: @@ -603,10 +603,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 url: "https://pub.dev" source: hosted - version: "14.3.1" + version: "15.0.0" watcher: dependency: transitive description: diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock index fb1565b5bd8e..a23397ab9c6f 100644 --- a/app/android/Gemfile.lock +++ b/app/android/Gemfile.lock @@ -10,7 +10,7 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.1015.0) + aws-partitions (1.1018.0) aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) @@ -19,7 +19,7 @@ GEM aws-sdk-kms (1.96.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.175.0) + aws-sdk-s3 (1.176.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -109,7 +109,7 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.74.0) + google-apis-androidpublisher_v3 (0.75.0) google-apis-core (>= 0.15.0, < 2.a) google-apis-core (0.15.1) addressable (~> 2.5, >= 2.5.1) @@ -123,7 +123,7 @@ GEM google-apis-core (>= 0.15.0, < 2.a) google-apis-playcustomapp_v1 (0.16.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.47.0) + google-apis-storage_v1 (0.48.0) google-apis-core (>= 0.15.0, < 2.a) google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) @@ -131,7 +131,7 @@ GEM google-cloud-env (2.2.1) faraday (>= 1.0, < 3.a) google-cloud-errors (1.4.0) - google-cloud-storage (1.52.0) + google-cloud-storage (1.53.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-core (~> 0.13) @@ -140,19 +140,21 @@ GEM google-cloud-core (~> 1.6) googleauth (~> 1.9) mini_mime (~> 1.0) - googleauth (1.11.2) + google-logging-utils (0.1.0) + googleauth (1.12.0) faraday (>= 1.0, < 3.a) - google-cloud-env (~> 2.1) + google-cloud-env (~> 2.2) + google-logging-utils (~> 0.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.6.2) - json (2.8.2) + json (2.9.0) jwt (2.9.3) base64 mini_magick (4.13.2) diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties index 82dd18b2043e..eb1a55be0e15 100644 --- a/app/android/gradle/wrapper/gradle-wrapper.properties +++ b/app/android/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/app/android/settings.gradle b/app/android/settings.gradle index c020fad3ed7a..951934bbd4be 100644 --- a/app/android/settings.gradle +++ b/app/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '8.7.2' apply false - id "org.jetbrains.kotlin.android" version "2.0.21" apply false + id "com.android.application" version '8.7.3' apply false + id "org.jetbrains.kotlin.android" version "2.1.0" apply false } include ":app" diff --git a/app/lib/dialogs/template.dart b/app/lib/dialogs/template.dart index 120dfb4c54e2..244757392f71 100644 --- a/app/lib/dialogs/template.dart +++ b/app/lib/dialogs/template.dart @@ -445,12 +445,15 @@ class _TemplateItem extends StatelessWidget { child: Text(AppLocalizations.of(context).duplicate), onPressed: () async { final result = await showDialog( - context: context, builder: (ctx) => NameDialog( - value: template.name, - )); + context: context, + builder: (ctx) => NameDialog( + value: template.name, + )); if (result == null) return; if (context.mounted) { - await fileSystem.createFileWithName(template.setMetadata(metadata.copyWith(name: result)), name: result); + await fileSystem.createFileWithName( + template.setMetadata(metadata.copyWith(name: result)), + name: result); onChanged(); } }, diff --git a/app/pubspec.lock b/app/pubspec.lock index f03137b0e454..46b9aec19670 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -840,8 +840,8 @@ packages: dependency: "direct main" description: path: "packages/lw_sysapi" - ref: "21808e89bb6239f0b39367d0c00b0b14f5273992" - resolved-ref: "21808e89bb6239f0b39367d0c00b0b14f5273992" + ref: ebf47114a4d63fc06a6be0dbbfd5594ed82e7ee5 + resolved-ref: ebf47114a4d63fc06a6be0dbbfd5594ed82e7ee5 url: "https://github.com/LinwoodDev/dart_pkgs" source: git version: "0.0.1" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index ddc957655df7..6f6836f16c2f 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -77,7 +77,7 @@ dependencies: lw_sysapi: git: url: https://github.com/LinwoodDev/dart_pkgs - ref: 21808e89bb6239f0b39367d0c00b0b14f5273992 + ref: ebf47114a4d63fc06a6be0dbbfd5594ed82e7ee5 path: packages/lw_sysapi networker: git: diff --git a/docs/package.json b/docs/package.json index 3566e8fe36eb..606ed5441b6e 100644 --- a/docs/package.json +++ b/docs/package.json @@ -15,7 +15,7 @@ "@astrojs/starlight": "^0.29.2", "@phosphor-icons/react": "^2.1.7", "@types/react": "^18.3.14", - "@types/react-dom": "^18.3.2", + "@types/react-dom": "^18.3.3", "astro": "^4.16.17", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 54585d3e0053..a011d688b3be 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -13,7 +13,7 @@ importers: version: 0.9.4(typescript@5.7.2) '@astrojs/react': specifier: ^3.6.3 - version: 3.6.3(@types/react-dom@18.3.2)(@types/react@18.3.14)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.82.0)(terser@5.36.0) + version: 3.6.3(@types/react-dom@18.3.3(@types/react@18.3.14))(@types/react@18.3.14)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.82.0)(terser@5.36.0) '@astrojs/starlight': specifier: ^0.29.2 version: 0.29.2(astro@4.16.17(rollup@4.28.1)(sass@1.82.0)(terser@5.36.0)(typescript@5.7.2)) @@ -24,8 +24,8 @@ importers: specifier: ^18.3.14 version: 18.3.14 '@types/react-dom': - specifier: ^18.3.2 - version: 18.3.2 + specifier: ^18.3.3 + version: 18.3.3(@types/react@18.3.14) astro: specifier: ^4.16.17 version: 4.16.17(rollup@4.28.1)(sass@1.82.0)(terser@5.36.0)(typescript@5.7.2) @@ -824,8 +824,10 @@ packages: '@types/prop-types@15.7.14': resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==} - '@types/react-dom@18.3.2': - resolution: {integrity: sha512-Fqp+rcvem9wEnGr3RY8dYNvSQ8PoLqjZ9HLgaPUOjJJD120uDyOxOjc/39M4Kddp9JQCxpGQbnhVQF0C0ncYVg==} + '@types/react-dom@18.3.3': + resolution: {integrity: sha512-uTYkxTLkYp41nq/ULXyXMtkNT1vu5fXJoqad6uTNCOGat5t9cLgF4vMNLBXsTOXpdOI44XzKPY1M5RRm0bQHuw==} + peerDependencies: + '@types/react': ^18.0.0 '@types/react@18.3.14': resolution: {integrity: sha512-NzahNKvjNhVjuPBQ+2G7WlxstQ+47kXZNHlUvFakDViuIEfGY926GqhMueQFZ7woG+sPiQKlF36XfrIUVSUfFg==} @@ -2481,10 +2483,10 @@ snapshots: dependencies: prismjs: 1.29.0 - '@astrojs/react@3.6.3(@types/react-dom@18.3.2)(@types/react@18.3.14)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.82.0)(terser@5.36.0)': + '@astrojs/react@3.6.3(@types/react-dom@18.3.3(@types/react@18.3.14))(@types/react@18.3.14)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.82.0)(terser@5.36.0)': dependencies: '@types/react': 18.3.14 - '@types/react-dom': 18.3.2 + '@types/react-dom': 18.3.3(@types/react@18.3.14) '@vitejs/plugin-react': 4.3.4(vite@5.4.11(sass@1.82.0)(terser@5.36.0)) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -3184,7 +3186,7 @@ snapshots: '@types/prop-types@15.7.14': {} - '@types/react-dom@18.3.2': + '@types/react-dom@18.3.3(@types/react@18.3.14)': dependencies: '@types/react': 18.3.14 diff --git a/metadata/en-US/changelogs/124.txt b/metadata/en-US/changelogs/124.txt index fb7f7f926a8c..86a6d2724bd0 100644 --- a/metadata/en-US/changelogs/124.txt +++ b/metadata/en-US/changelogs/124.txt @@ -5,6 +5,7 @@ * Change create template button to save icon * Improve thumbnail display to have rounded corners * Change zoom dependent to false by default +* Fix export on web * Fix zoom dependent not working correctly with the label tool ([#765](https://github.com/LinwoodDev/Butterfly/issues/765)) Read more here: https://linwood.dev/butterfly/2.2.3-rc.1 \ No newline at end of file