Skip to content

Commit

Permalink
Merge pull request #298 from olmps/flutter-2.10.3
Browse files Browse the repository at this point in the history
Bumps Flutter to `2.10.3` and updates all dependencies to the latest version
  • Loading branch information
ggirotto authored Apr 6, 2022
2 parents b15d976 + 38963f8 commit b52cf18
Show file tree
Hide file tree
Showing 50 changed files with 1,009 additions and 572 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/analyze-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- main

env:
flutter_version: "2.5.3"
flutter_version: "2.10.3"
flutter_channel: "stable"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- "android/**"

env:
flutter_version: "2.5.3"
flutter_version: "2.10.3"
flutter_channel: "stable"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- "ios/**"

env:
flutter_version: "2.5.3"
flutter_version: "2.10.3"
flutter_channel: "stable"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- published

env:
flutter_version: "2.5.3"
flutter_version: "2.10.3"
java_version: "12.x"
flutter_channel: "stable"

Expand Down
294 changes: 258 additions & 36 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,49 +1,271 @@
# Miscellaneous
*.class
*.log
*.pyc
*.swp
.DS_Store
.atom/
.buildlog/
.history
.svn/

# IntelliJ related
*.iml
*.ipr
*.iws
.idea/
# Created by https://www.toptal.com/developers/gitignore/api/dart,flutter,androidstudio,fastlane
# Edit at https://www.toptal.com/developers/gitignore?templates=dart,flutter,androidstudio,fastlane

# The .vscode folder contains launch configuration and tasks you configure in
# VS Code which you may wish to be included in version control, so this line
# is commented out by default.
#.vscode/
### Dart ###
# See https://www.dartlang.org/guides/libraries/private-files

# Flutter/Dart/Pub related
**/doc/api/
**/ios/Flutter/.last_build_id
# Files and directories created by pub
.dart_tool/
.packages
build/
# If you're building an application, you may want to check-in your pubspec.lock
pubspec.lock

# Directory created by dartdoc
# If you don't generate documentation locally you can remove this line.
doc/api/

# dotenv environment variables file
.env*

# Avoid committing generated Javascript files:
*.dart.js
*.info.json # Produced by the --dump-info flag.
*.js # When generated by dart2js. Don't specify *.js if your
# project includes source files written in JavaScript.
*.js_
*.js.deps
*.js.map

.flutter-plugins
.flutter-plugins-dependencies
.packages

### Dart Patch ###
# dotenv environment variables file
.env

### fastlane ###
# fastlane - A streamlined workflow tool for Cocoa deployment
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

# fastlane specific
ios/fastlane/report.xml
ios/fastlane/README.md
android/fastlane/report.xml
android/fastlane/README.md

# deliver temporary files
ios/fastlane/Preview.html
android/fastlane/Preview.html

# snapshot generated screenshots
ios/fastlane/screenshots/**/*.png
ios/fastlane/screenshots/screenshots.html
android/fastlane/screenshots/**/*.png
android/fastlane/screenshots/screenshots.html

# scan temporary files
ios/fastlane/test_output
android/fastlane/test_output

# Fastlane.swift runner binary
ios/fastlane/FastlaneRunner
android/fastlane/FastlaneRunner

### Flutter ###
# Flutter/Dart/Pub related
**/doc/api/
.fvm/
.pub-cache/
.pub/
/build/

# Web related
coverage/
lib/generated_plugin_registrant.dart
# For library packages, don’t commit the pubspec.lock file.
# Regenerating the pubspec.lock file lets you test your package against the latest compatible versions of its dependencies.
# See https://dart.dev/guides/libraries/private-files#pubspeclock
#pubspec.lock

# Android related
**/android/**/gradle-wrapper.jar
**/android/.gradle
**/android/captures/
**/android/gradlew
**/android/gradlew.bat
**/android/key.properties
**/android/local.properties
**/android/**/GeneratedPluginRegistrant.java

# iOS/XCode related
**/ios/**/*.mode1v3
**/ios/**/*.mode2v3
**/ios/**/*.moved-aside
**/ios/**/*.pbxuser
**/ios/**/*.perspectivev3
**/ios/**/*sync/
**/ios/**/.sconsign.dblite
**/ios/**/.tags*
**/ios/**/.vagrant/
**/ios/**/DerivedData/
**/ios/**/Icon?
**/ios/**/Pods/
**/ios/**/.symlinks/
**/ios/**/profile
**/ios/**/xcuserdata
**/ios/.generated/
**/ios/Flutter/.last_build_id
**/ios/Flutter/App.framework
**/ios/Flutter/Flutter.framework
**/ios/Flutter/Flutter.podspec
**/ios/Flutter/Generated.xcconfig
**/ios/Flutter/app.flx
**/ios/Flutter/app.zip
**/ios/Flutter/flutter_assets/
**/ios/Flutter/flutter_export_environment.sh
**/ios/ServiceDefinitions.json
**/ios/Runner/GeneratedPluginRegistrant.*

# Exceptions to above rules.
!**/ios/**/default.mode1v3
!**/ios/**/default.mode2v3
!**/ios/**/default.pbxuser
!**/ios/**/default.perspectivev3
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

### AndroidStudio ###
# Covers files to be ignored for android development using Android Studio.

# Built application files
*.apk
*.ap_
*.aab

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
.gradle
.gradle/

# Signing files
.signing/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio
/*/build/
/*/local.properties
/*/out
/*/*/build
/*/*/production
captures/
.navigation/
*.ipr
*~
*.swp

# Keystore files
*.jks
*.keystore

# Google Services (e.g. APIs or Firebase)
# google-services.json

# Android Patch
gen-external-apklibs

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# NDK
obj/

# IntelliJ IDEA
*.iml
*.iws
/out/

# User-specific configurations
.idea/caches/
.idea/libraries/
.idea/shelf/
.idea/workspace.xml
.idea/tasks.xml
.idea/.name
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/encodings.xml
.idea/misc.xml
.idea/modules.xml
.idea/scopes/scope_settings.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml
.idea/datasources.xml
.idea/dataSources.ids
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
.idea/assetWizardSettings.xml
.idea/gradle.xml
.idea/jarRepositories.xml
.idea/navEditor.xml

# Legacy Eclipse project files
.classpath
.project
.cproject
.settings/

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.war
*.ear

# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
hs_err_pid*

## Plugin-specific files:

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Mongo Explorer plugin
.idea/mongoSettings.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### AndroidStudio Patch ###

# Symbolication related
app.*.symbols
!/gradle/wrapper/gradle-wrapper.jar

# Obfuscation related
app.*.map.json
# End of https://www.toptal.com/developers/gitignore/api/dart,flutter,androidstudio,fastlane

# Android Studio will place build artifacts here
/android/app/debug
/android/app/profile
/android/app/release
# Android Secret files
android/key.properties
android/gcp_service_account.json
android/app/keystore.jks
android/key.properties
android/app/google-services.json
android/firebase_distribution_service_account.json

# Firebase Distribution Service Account
firebase_distribution_service_account.json
# Google Services Info.plist
ios/Runner/GoogleService-Info.plist
23 changes: 0 additions & 23 deletions android/.gitignore

This file was deleted.

6 changes: 3 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 30
compileSdkVersion 31

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}

defaultConfig {
applicationId "com.olmps.memoClient"
minSdkVersion 17
targetSdkVersion 30
minSdkVersion 21
targetSdkVersion 31
versionCode 7
versionName flutterVersionName
}
Expand Down
Loading

0 comments on commit b52cf18

Please sign in to comment.