Skip to content

Commit

Permalink
Upgrade Flutter to 3.16 (#354)
Browse files Browse the repository at this point in the history
* upgrade flutter, sdk and dependencies

* add new super syntax

* add accuracy

* fix qrImageView

* remove deprecated stuff

* update pubspec.yaml

* fix gradle, get app to compile

* Bump gradle version to 7.4.2

* replace wakelock by wakelockplus

* disable wakelock in finish_button

* remove deprecated stuff

* recalibrate landscapemode

* update filepicker

* remove deprecated stuff

* polishing

* get everything running on ios

* get everything running on ios

* reset landscapemode on ios

* tweak landscapemode

* update fl_chart

* update drift

* remove deprecated zone

* shorten edmund allee shortcut name to fix text bug

* update Flutter Version in README

* Fix qrcode depracted attribute and fix mapbox zoom, credentials and onLongPress Android

* fix statusmap logo and attribute margins

---------

Co-authored-by: adeveloper-wq <[email protected]>
Co-authored-by: PaulPickhardt <[email protected]>
  • Loading branch information
3 people authored Nov 28, 2023
1 parent 8352022 commit f42ec5e
Show file tree
Hide file tree
Showing 153 changed files with 831 additions and 879 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ concurrency:
jobs:
test:
runs-on: self-hosted
container: cirrusci/flutter:3.7.3
container: ghcr.io/cirruslabs/flutter:3.16.0
steps:
- uses: actions/checkout@v2
- name: Run unit tests and check for styling errors
run: |
flutter pub get
flutter format --line-length 120 --set-exit-if-changed .
dart format --line-length 120 --set-exit-if-changed .
flutter analyze .
flutter test
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# PrioBike-HH Flutter App

**Required Flutter Version: `3.7.3`**
**Required Flutter Version: `3.16.0`**

For getting started with development you need to set up your development environment according to the [guide](https://docs.flutter.dev/get-started/install).

Expand Down
2 changes: 2 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ linter:

# Don't use the following rules.
implementation_imports: false
use_super_parameters: true


# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options
10 changes: 9 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) {

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
Expand Down Expand Up @@ -75,6 +75,14 @@ android {
signingConfig signingConfigs.release
}
}

namespace 'de.tudresden.priobike'
packagingOptions {
jniLibs {
pickFirsts += ['**/libc++_shared.so', '**/libfbjni.so']
}
}

}

flutter {
Expand Down
3 changes: 1 addition & 2 deletions android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.tudresden.priobike">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
3 changes: 1 addition & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.tudresden.priobike">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission
android:name="android.permission.INTERNET"/>
<uses-permission
Expand Down
3 changes: 1 addition & 2 deletions android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.tudresden.priobike">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
buildscript {
ext.kotlin_version = '1.6.10'
ext.kotlin_version = '1.9.21'
repositories {
google()
mavenCentral()
}

dependencies {
// See: https://developer.android.com/studio/releases/gradle-plugin
classpath 'com.android.tools.build:gradle:7.1.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// Add the dependency for the Google services Gradle plugin
classpath 'com.google.gms:google-services:4.3.13'
Expand All @@ -27,6 +27,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
Loading

0 comments on commit f42ec5e

Please sign in to comment.