Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update flutter version #382

Merged
merged 4 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Dependencies
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Configure Flutter
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Java
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Java
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Tools
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Tools
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup Flutter ╰(✿˙ᗜ˙)੭━☆゚.*・。゚
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Tools ᕙ|” ◉ ◡ ◉ ”|ᕗ
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Clone Olm
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Java
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Java
Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Tools
Expand Down Expand Up @@ -239,7 +239,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Tools
Expand Down Expand Up @@ -293,7 +293,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Tools
Expand Down Expand Up @@ -338,7 +338,7 @@ jobs:
- name: Setup Flutter
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Tools
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup Flutter ╰(✿˙ᗜ˙)੭━☆゚.*・。゚
uses: subosito/[email protected]
with:
flutter-version: '3.22.3'
flutter-version: '3.24.4'
channel: 'stable'

- name: Setup Tools ᕙ|” ◉ ◡ ◉ ”|ᕗ
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Help translate Commet to your language on [Weblate](https://hosted.weblate.org/p
</a>

# Development
Commet is built using [Flutter](https://flutter.dev), currently v3.22.3
Commet is built using [Flutter](https://flutter.dev), currently v3.24.4

This repo currently has a monorepo structure, containing two flutter projects: Commet and Tiamat. Commet is the main client, and Tiamat is a sort of wrapper around Material with some extra goodies, which is used to maintain a consistent style across the app. Tiamat may eventually be moved to its own repo, but for now it is maintained here for ease of development.
## Building
Expand Down
13 changes: 13 additions & 0 deletions commet/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@ rootProject.buildDir = '../build'
subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"
}

subprojects {
afterEvaluate { project ->
if (project.plugins.hasPlugin("com.android.application") ||
project.plugins.hasPlugin("com.android.library")) {
project.android {
compileSdkVersion 34
buildToolsVersion "34.0.0"
}
}
}
}

subprojects {
project.evaluationDependsOn(':app')
}
Expand Down
1 change: 1 addition & 0 deletions commet/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_17_HOME
2 changes: 1 addition & 1 deletion commet/macos/Flutter/GeneratedPluginRegistrant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import path_provider_foundation
import screen_brightness_macos
import screen_retriever
import shared_preferences_foundation
import sqflite
import sqflite_darwin
import sqlite3_flutter_libs
import url_launcher_macos
import wakelock_plus
Expand Down
Loading
Loading