Skip to content

Commit 9a5e6dc

Browse files
OutdatedGuyOutdatedGuy
authored
chore: updated template & dependencies to latest (#53)
* chore: updated template to Flutter 3.22 * chore: updated dependencies to latest
1 parent 7168e7b commit 9a5e6dc

File tree

24 files changed

+1453
-778
lines changed

24 files changed

+1453
-778
lines changed

‎.metadata‎

Lines changed: 1 addition & 1 deletion
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: "2e9cb0aa71a386a91f73f7088d115c0d96654829"
7+
revision: "761747bfc538b5af34aa0d3fac380f1bc331ec49"
88
channel: "stable"
99

1010
project_type: package

‎example/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ google-services.json
4747
firebase_options.dart
4848
firebase_app_id_file.json
4949
GoogleService-Info.plist
50+
firebase.json

‎example/.metadata‎

Lines changed: 11 additions & 11 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: "2e9cb0aa71a386a91f73f7088d115c0d96654829"
7+
revision: "761747bfc538b5af34aa0d3fac380f1bc331ec49"
88
channel: "stable"
99

1010
project_type: app
@@ -13,20 +13,20 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 2e9cb0aa71a386a91f73f7088d115c0d96654829
17-
base_revision: 2e9cb0aa71a386a91f73f7088d115c0d96654829
16+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
17+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
1818
- platform: android
19-
create_revision: 2e9cb0aa71a386a91f73f7088d115c0d96654829
20-
base_revision: 2e9cb0aa71a386a91f73f7088d115c0d96654829
19+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
20+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
2121
- platform: ios
22-
create_revision: 2e9cb0aa71a386a91f73f7088d115c0d96654829
23-
base_revision: 2e9cb0aa71a386a91f73f7088d115c0d96654829
22+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
23+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
2424
- platform: macos
25-
create_revision: 2e9cb0aa71a386a91f73f7088d115c0d96654829
26-
base_revision: 2e9cb0aa71a386a91f73f7088d115c0d96654829
25+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
26+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
2727
- platform: web
28-
create_revision: 2e9cb0aa71a386a91f73f7088d115c0d96654829
29-
base_revision: 2e9cb0aa71a386a91f73f7088d115c0d96654829
28+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
29+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
3030

3131
# User provided section
3232

‎example/android/app/build.gradle‎

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,60 @@
11
plugins {
22
id "com.android.application"
3+
// START: FlutterFire Configuration
4+
id 'com.google.gms.google-services'
5+
// END: FlutterFire Configuration
36
id "kotlin-android"
7+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
48
id "dev.flutter.flutter-gradle-plugin"
59
}
610

711
def localProperties = new Properties()
8-
def localPropertiesFile = rootProject.file('local.properties')
12+
def localPropertiesFile = rootProject.file("local.properties")
913
if (localPropertiesFile.exists()) {
10-
localPropertiesFile.withReader('UTF-8') { reader ->
14+
localPropertiesFile.withReader("UTF-8") { reader ->
1115
localProperties.load(reader)
1216
}
1317
}
1418

15-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
19+
def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
1620
if (flutterVersionCode == null) {
17-
flutterVersionCode = '1'
21+
flutterVersionCode = "1"
1822
}
1923

20-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
24+
def flutterVersionName = localProperties.getProperty("flutter.versionName")
2125
if (flutterVersionName == null) {
22-
flutterVersionName = '1.0'
26+
flutterVersionName = "1.0"
2327
}
2428

2529
android {
26-
namespace "rocks.outdatedguy.firebase_pagination_example"
27-
compileSdkVersion flutter.compileSdkVersion
28-
ndkVersion flutter.ndkVersion
30+
namespace = "rocks.outdatedguy.firebase_pagination_example"
31+
compileSdk = flutter.compileSdkVersion
32+
ndkVersion = flutter.ndkVersion
2933

3034
compileOptions {
31-
sourceCompatibility JavaVersion.VERSION_1_8
32-
targetCompatibility JavaVersion.VERSION_1_8
33-
}
34-
35-
kotlinOptions {
36-
jvmTarget = '1.8'
37-
}
38-
39-
sourceSets {
40-
main.java.srcDirs += 'src/main/kotlin'
35+
sourceCompatibility = JavaVersion.VERSION_17
36+
targetCompatibility = JavaVersion.VERSION_17
4137
}
4238

4339
defaultConfig {
44-
applicationId "rocks.outdatedguy.firebase_pagination_example"
40+
applicationId = "rocks.outdatedguy.firebase_pagination_example"
4541
// You can update the following values to match your application needs.
4642
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
47-
minSdkVersion flutter.minSdkVersion
48-
targetSdkVersion flutter.targetSdkVersion
49-
versionCode flutterVersionCode.toInteger()
50-
versionName flutterVersionName
51-
multiDexEnabled true
43+
minSdk = flutter.minSdkVersion
44+
targetSdk = flutter.targetSdkVersion
45+
versionCode = flutterVersionCode.toInteger()
46+
versionName = flutterVersionName
47+
multiDexEnabled = true
5248
}
5349

5450
buildTypes {
5551
release {
56-
// TODO: Add your own signing config for the release build.
5752
// Signing with the debug keys for now, so `flutter run --release` works.
58-
signingConfig signingConfigs.debug
53+
signingConfig = signingConfigs.debug
5954
}
6055
}
6156
}
6257

6358
flutter {
64-
source '../..'
59+
source = "../.."
6560
}
66-
67-
dependencies {}

‎example/android/app/src/main/AndroidManifest.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
android:name=".MainActivity"
1111
android:exported="true"
1212
android:launchMode="singleTop"
13+
android:taskAffinity=""
1314
android:theme="@style/LaunchTheme"
1415
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1516
android:hardwareAccelerated="true"
@@ -33,4 +34,15 @@
3334
android:name="flutterEmbedding"
3435
android:value="2" />
3536
</application>
37+
<!-- Required to query activities that can process text, see:
38+
https://developer.android.com/training/package-visibility and
39+
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
40+
41+
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
42+
<queries>
43+
<intent>
44+
<action android:name="android.intent.action.PROCESS_TEXT"/>
45+
<data android:mimeType="text/plain"/>
46+
</intent>
47+
</queries>
3648
</manifest>

‎example/android/app/src/main/kotlin/rocks/outdatedguy/firebase_pagination_example/MainActivity.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package rocks.outdatedguy.firebase_pagination_example
22

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

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity: FlutterActivity()

‎example/android/build.gradle‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,16 @@
1-
buildscript {
2-
ext.kotlin_version = '1.7.10'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
10-
}
11-
}
12-
131
allprojects {
142
repositories {
153
google()
164
mavenCentral()
175
}
186
}
197

20-
rootProject.buildDir = '../build'
8+
rootProject.buildDir = "../build"
219
subprojects {
2210
project.buildDir = "${rootProject.buildDir}/${project.name}"
2311
}
2412
subprojects {
25-
project.evaluationDependsOn(':app')
13+
project.evaluationDependsOn(":app")
2614
}
2715

2816
tasks.register("clean", Delete) {

‎example/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
1+
org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

‎example/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip

‎example/android/settings.gradle‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,24 @@ pluginManagement {
55
def flutterSdkPath = properties.getProperty("flutter.sdk")
66
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
77
return flutterSdkPath
8-
}
9-
settings.ext.flutterSdkPath = flutterSdkPath()
8+
}()
109

11-
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
1211

1312
repositories {
1413
google()
1514
mavenCentral()
1615
gradlePluginPortal()
1716
}
18-
19-
plugins {
20-
id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
21-
}
2217
}
2318

2419
plugins {
2520
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2621
id "com.android.application" version "7.3.0" apply false
22+
// START: FlutterFire Configuration
23+
id "com.google.gms.google-services" version "4.3.15" apply false
24+
// END: FlutterFire Configuration
25+
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
2726
}
2827

2928
include ":app"

0 commit comments

Comments
 (0)