Skip to content
This repository has been archived by the owner on Jun 13, 2024. It is now read-only.

Minor build tweaks #502

Merged
merged 2 commits into from
May 17, 2021
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 .firebaserc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projects": {
"default": "gallery-flutter-dev",
"default": "gallery-staging-flutter-dev",
"prod": "gallery-flutter-dev",
"staging": "gallery-staging-flutter-dev"
}
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ more details.

## Creating a new release (for Flutter org members)

1. Version bump: Create a PR to bump the `pubspec.yaml` version number. Use [semantic versioning](https://semver.org/) to determine
1. **Version bump**: Create a PR to bump the `pubspec.yaml` version number. Use [semantic versioning](https://semver.org/) to determine
which part to increment. The version number after the `+` should also be incremented. For example `1.2.3+010203`
with a patch should become `1.2.4+010204`.

2. Staging: After the version bump PR is merged, push a new version tag to master.
2. **Staging**: After the version bump PR is merged, push a new version tag to master.
```bash
git pull upstream master
git tag v1.2.4 # note the v
Expand All @@ -119,12 +119,12 @@ git push upstream v1.2.4
* Deploy the gallery to the Firebase hosted [staging site](https://gallery-staging-flutter-dev.web.app/)
* Deploy a new Android build to the Play Store [beta track](https://play.google.com/apps/testing/io.flutter.demo.gallery)

3. Production: Once satisfied,
3. **Production**: Once satisfied,
* Publish the drafted [GitHub release](https://github.com/flutter/gallery/releases) (`Edit draft` -> `Publish release`).
* Deploy the gallery to the Firebase hosted [production site](https://gallery.flutter.dev) by running this [workflow](https://github.com/flutter/gallery/actions/workflows/deploy_web.yml) using GitHub's UI.
* Promote the Play Store beta to production by running this [workflow](https://github.com/flutter/gallery/actions/workflows/deploy_play_store.yml) using GitHub's UI.
* Deploy the gallery to the Firebase hosted [production site](https://gallery.flutter.dev) by running [this workflow](https://github.com/flutter/gallery/actions/workflows/deploy_web.yml) with `prod` using GitHub's UI.
* Promote the Play Store beta to production by running [this workflow](https://github.com/flutter/gallery/actions/workflows/deploy_play_store.yml) with `promote_to_production` using GitHub's UI.

More information about running workflows is available at http://go/flutter-gallery-manual-deployment.
More information about doing these things locally is available at [go/flutter-gallery-manual-deployment](http://go/flutter-gallery-manual-deployment).

## Tests

Expand Down
5 changes: 4 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ android {
}
buildTypes {
release {
// Uncomment to run flutter run --release locally
// signingConfig signingConfigs.debug

signingConfig signingConfigs.release
}
}
Expand All @@ -77,5 +80,5 @@ flutter {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.google.android.play:core:1.8.0"
implementation "com.google.android.play:core:1.10.0"
}
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.4.31'
ext.kotlin_version = '1.4.32'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.android.tools.build:gradle:4.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
6 changes: 3 additions & 3 deletions deferred_components_loading_units.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ loading-units:
- package:gallery/studies/shrine/model/products_repository.dart
- package:gallery/studies/shrine/supplemental/balanced_layout.dart
- package:gallery/studies/shrine/supplemental/desktop_product_columns.dart
- package:gallery/studies/shrine/supplemental/product_columns.dart
- package:gallery/studies/shrine/supplemental/product_card.dart
- package:gallery/studies/shrine/supplemental/product_columns.dart
- package:gallery/studies/shrine/supplemental/cut_corners_border.dart
- id: 81
libraries:
Expand Down Expand Up @@ -359,10 +359,10 @@ loading-units:
- package:gallery/demos/material/tooltip_demo.dart
- id: 83
libraries:
- package:gallery/demos/reference/motion_demo_container_transition.dart
- package:gallery/demos/reference/colors_demo.dart
- id: 84
libraries:
- package:gallery/demos/reference/colors_demo.dart
- package:gallery/demos/reference/motion_demo_container_transition.dart
- id: 85
libraries:
- package:gallery/demos/reference/transformations_demo.dart
Expand Down