Skip to content

Commit 05a7be0

Browse files
authored
Merge branch 'master' into dependabot/gradle/android/com.google.gms.google-services-4.4.4
2 parents eefbfeb + 319120d commit 05a7be0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+24092
-24740
lines changed

.github/actions/setup_build/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ inputs:
99
default: "zulu"
1010
flutter-version:
1111
description: "Flutter Version"
12-
default: "3.35.3"
12+
default: "3.35.7"
1313
ruby-version:
1414
description: "Ruby Version"
1515
default: "3.4"
@@ -37,4 +37,4 @@ runs:
3737
- uses: maxim-lobanov/setup-xcode@v1
3838
if: runner.os == 'macOS'
3939
with:
40-
xcode-version: latest-stable
40+
xcode-version: 16.4

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
name: Build
3333
runs-on: ${{ matrix.os }}
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
with:
3737
fetch-depth: 0
3838
- name: Setup Environment
@@ -64,7 +64,7 @@ jobs:
6464

6565
sentry-dsn: ${{ secrets.SENTRY_DSN }}
6666
- name: Build IOS / Upload Beta
67-
if: github.event_name == 'push' && matrix.build != 'apk'
67+
if: github.event_name == 'push'
6868
run: bash ${GITHUB_WORKSPACE}/Scripts/fastlane.sh
6969
working-directory: Scripts
7070
env:

.github/workflows/localization_strings_update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
contents: write # 'write' access to repository contents
1111
pull-requests: write # 'write' access to pull requests
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- name: Setup Environment
1515
uses: ./.github/actions/setup_build
1616
- name: Install packages

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
assets: ${{ steps.release.outputs.assets }}
2424

2525
steps:
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2727
if: "${{ github.event.inputs.commit_sha == '' }}"
2828
with:
2929
fetch-depth: 0
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v5
3131
if: "${{ github.event.inputs.commit_sha != '' }}"
3232
with:
3333
fetch-depth: 0
@@ -70,7 +70,7 @@ jobs:
7070
runs-on: ubuntu-latest
7171
needs: prepare_release
7272
steps:
73-
- uses: actions/checkout@v4
73+
- uses: actions/checkout@v5
7474
- name: get values
7575
id: get-fields
7676
env:

.github/workflows/reset_ios_certs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.FASTLANE_GITHUB }}
1616
MATCH_PASSWORD: ${{ secrets.FASTLANE_MATCH_PASSWORD }}
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
- name: Setup Environment
2020
uses: ./.github/actions/setup_build
2121
- run: echo "$APPLE_SECRETS" > APPLE_SECRETS.json

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
### V 1.3.1
1+
### V 1.4.1
22

3+
- Fix issue where having a glowtip move selected will stop normal moves from runnign for triggers
4+
5+
### V 1.4.0
6+
7+
- Split moves by gear type
38
- Rework analytics to be more useful
49
- Add CosHub posts to Home UI
10+
- Fix some missing blog post images
11+
- Hide unavailable moves on the trigger edit screen.
512
- Disabled 'Nearby Gear' trigger as it has been broken for awhile. This will hopefully come back in a future release
13+
- Add support for future firmware changes
614
- some bug fixes
715

816
### V 1.3.0

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.1
1+
1.4.1

analysis_options.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,6 @@ analyzer:
3232
- build/**
3333
- pub_cache/**
3434
- lib/**.g.dart
35-
- lib/l10n/**
35+
- lib/l10n/**
36+
plugins:
37+
- custom_lint

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ flutter {
101101
}
102102

103103
dependencies {
104-
implementation "org.jetbrains.kotlin:kotlin-stdlib:2.2.0"
104+
implementation "org.jetbrains.kotlin:kotlin-stdlib:2.2.21"
105105
testImplementation "junit:junit:4.13.2"
106106
// https://developer.android.com/jetpack/androidx/releases/test/#1.2.0
107107
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.5"

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ tasks.register("clean", Delete) {
3434
}
3535
configurations.all {
3636
resolutionStrategy {
37-
force "androidx.core:core-ktx:1.16.0"
37+
force "androidx.core:core-ktx:1.17.0"
3838
}
3939
}

0 commit comments

Comments
 (0)