Skip to content

Commit cc2b953

Browse files
authored
chore: Update Dependencies (#156)
1 parent 6c96629 commit cc2b953

File tree

15 files changed

+78
-104
lines changed

15 files changed

+78
-104
lines changed

.github/workflows/pull_request_validation.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,22 @@ jobs:
1616
- name: 📚 Git Checkout
1717
uses: actions/checkout@v4
1818

19+
- name: ♨️ Setup Java
20+
uses: actions/setup-java@v3
21+
with:
22+
java-version: '17'
23+
distribution: 'temurin'
24+
1925
- name: 🐦 Setup Flutter
2026
uses: subosito/flutter-action@v2
2127
with:
2228
channel: 'stable'
2329
cache: true
2430
cache-key: flutter-:os:-:channel:-:version:-:arch:-:hash:-${{ hashFiles('**/pubspec.lock') }}
2531

32+
- name: 🛎️ Checking Flutter Version
33+
run: flutter --version
34+
2635
- name: 📦 Install Dependencies
2736
run: flutter pub get
2837

@@ -32,9 +41,6 @@ jobs:
3241
- name: 🕵️ Analyze Code
3342
run: flutter analyze lib test
3443

35-
- name: ✨ Check Formatting
36-
run: dart format --line-length 80 --set-exit-if-changed lib test
37-
3844
- name: 🏗️ Build APK (Production Flavor)
3945
run: flutter build apk --release --flavor production -t lib/main_production.dart
4046

.metadata

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1"
7+
revision: "2663184aa79047d0a33a14a3b607954f8fdd8730"
88
channel: "stable"
99

1010
project_type: app
@@ -13,11 +13,11 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
17-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
18-
- platform: ios
19-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
20-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
16+
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
17+
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
18+
- platform: android
19+
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
20+
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
2121

2222
# User provided section
2323

.run/Development Release.run.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.run/Staging Release.run.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

android/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gradle-wrapper.jar
77
GeneratedPluginRegistrant.java
88

99
# Remember to never publicly share your keystore.
10-
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
10+
# See https://flutter.dev/to/reference-keystore
1111
key.properties
1212
**/*.keystore
1313
**/*.jks

android/app/build.gradle

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,22 @@ plugins {
44
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
55
id "dev.flutter.flutter-gradle-plugin"
66
}
7-
8-
def localProperties = new Properties()
9-
def localPropertiesFile = rootProject.file("local.properties")
10-
if (localPropertiesFile.exists()) {
11-
localPropertiesFile.withReader("UTF-8") { reader ->
12-
localProperties.load(reader)
13-
}
14-
}
15-
16-
def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
17-
if (flutterVersionCode == null) {
18-
flutterVersionCode = "1"
19-
}
20-
21-
def flutterVersionName = localProperties.getProperty("flutter.versionName")
22-
if (flutterVersionName == null) {
23-
flutterVersionName = "1.0"
24-
}
25-
26-
277
// TODO: Change the appName, it will be used as app label
28-
def appName = "Flutter Template"
8+
def appName = "Monstarlab Flutter Template"
299

3010
// TODO: Change the applicationId for production
3111
// On staging it will add .staging and on development it will add .development as suffix.
32-
def applicationId = "com.example.flutter_template"
12+
def applicationId = "com.monstarlab.flutter"
13+
14+
ext {
15+
androidMinSdkVersion = 21
16+
androidCompileAndTargetSdkVersion = 34
17+
}
3318

3419

3520
android {
3621
namespace = "$applicationId"
37-
compileSdk = flutter.compileSdkVersion
22+
compileSdk = androidCompileAndTargetSdkVersion
3823
ndkVersion = flutter.ndkVersion
3924

4025
compileOptions {
@@ -49,11 +34,11 @@ android {
4934
defaultConfig {
5035
applicationId = "$applicationId"
5136
// You can update the following values to match your application needs.
52-
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
53-
minSdk = flutter.minSdkVersion
54-
targetSdk = flutter.targetSdkVersion
55-
versionCode = flutterVersionCode.toInteger()
56-
versionName = flutterVersionName
37+
// For more information, see: https://flutter.dev/to/review-gradle-config.
38+
minSdk = androidMinSdkVersion
39+
targetSdk = androidCompileAndTargetSdkVersion
40+
versionCode = flutter.versionCode
41+
versionName = flutter.versionName
5742
}
5843

5944
buildTypes {

android/app/src/main/kotlin/com/example/flutter_template/MainActivity.kt renamed to android/app/src/main/kotlin/com/monstarlab/flutter/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.flutter_template
1+
package com.monstarlab.flutter
22

33
import io.flutter.embedding.android.FlutterActivity
44

android/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ allprojects {
55
}
66
}
77

8-
rootProject.buildDir = '../build'
9-
10-
8+
rootProject.buildDir = "../build"
119
// [NStack] the namespace property is null within
1210
// the android block of the build.gradle file for the nstack sdk.
1311
// Additionally, the Kotlin Gradle plugin is using a very old version there.

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
1+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "7.3.0" apply false
21+
id "com.android.application" version '7.4.2' apply false
2222
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
2323
}
2424

0 commit comments

Comments
 (0)