Skip to content

Commit 2651710

Browse files
committed
atualizando projeto
1 parent 5181177 commit 2651710

37 files changed

+1176
-1050
lines changed

.metadata

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

66
version:
7-
revision: d79295af24c3ed621c33713ecda14ad196fd9c31
8-
channel: stable
7+
revision: "761747bfc538b5af34aa0d3fac380f1bc331ec49"
8+
channel: "stable"
99

1010
project_type: app
11+
12+
# Tracks metadata for the flutter migrate command
13+
migration:
14+
platforms:
15+
- platform: root
16+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
17+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
18+
- platform: android
19+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
20+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
21+
- platform: ios
22+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
23+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
24+
- platform: linux
25+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
26+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
27+
- platform: macos
28+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
29+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
30+
- platform: web
31+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
32+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
33+
- platform: windows
34+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
35+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
36+
37+
# User provided section
38+
39+
# List of Local paths (relative to this file) that should be
40+
# ignored by the migrate tool.
41+
#
42+
# Files that are not part of the templates will be ignored by default.
43+
unmanaged_files:
44+
- 'lib/main.dart'
45+
- 'ios/Runner.xcodeproj/project.pbxproj'

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "automatic"
3+
}

android/.project

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,15 @@
1414
<natures>
1515
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
1616
</natures>
17+
<filteredResources>
18+
<filter>
19+
<id>1721135133511</id>
20+
<name></name>
21+
<type>30</type>
22+
<matcher>
23+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
24+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
25+
</matcher>
26+
</filter>
27+
</filteredResources>
1728
</projectDescription>

android/.settings/org.eclipse.buildship.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
arguments=
2-
auto.sync=false
1+
arguments=--init-script /var/folders/20/lrk1001d3v34wc_th8z_vgph0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/20/lrk1001d3v34wc_th8z_vgph0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
2+
auto.sync=true
33
build.scans.enabled=false
44
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
55
connection.project.dir=
66
eclipse.preferences.version=1
77
gradle.user.home=
8-
java.home=/usr/lib/jvm/java-11-openjdk-amd64
8+
java.home=/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home
99
jvm.arguments=
1010
offline.mode=false
1111
override.workspace.settings=true

android/app/build.gradle

Lines changed: 36 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
id "com.google.gms.google-services"
6+
}
7+
18
def localProperties = new Properties()
29
def localPropertiesFile = rootProject.file('local.properties')
310
if (localPropertiesFile.exists()) {
@@ -6,11 +13,6 @@ def localProperties = new Properties()
613
}
714
}
815

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
1416
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1517
if (flutterVersionCode == null) {
1618
flutterVersionCode = '1'
@@ -21,74 +23,49 @@ if (flutterVersionName == null) {
2123
flutterVersionName = '1.0'
2224
}
2325

24-
def mapsProperties = new Properties()
25-
def localMapsPropertiesFile = rootProject.file('local_maps.properties')
26-
if (localMapsPropertiesFile.exists()) {
27-
project.logger.info('Load maps properties from local file')
28-
localMapsPropertiesFile.withReader('UTF-8') { reader ->
29-
mapsProperties.load(reader)
30-
}
31-
} else {
32-
project.logger.info('Load maps properties from environment')
33-
try {
34-
mapsProperties['MAPS_API_KEY'] = System.getenv('MAPS_API_KEY')
35-
} catch(NullPointerException e) {
36-
project.logger.warn('Failed to load MAPS_API_KEY from environment.', e)
37-
}
38-
}
39-
def mapsApiKey = mapsProperties.getProperty('MAPS_API_KEY')
40-
if(mapsApiKey == null){
41-
mapsApiKey = ""
42-
project.logger.error('Google Maps Api Key not configured. Set it in `local_maps.properties` or in the environment variable `MAPS_API_KEY`')
43-
}
44-
45-
46-
apply plugin: 'com.android.application'
47-
apply plugin: 'kotlin-android'
48-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
4926

5027
android {
5128

52-
compileSdkVersion 31
29+
namespace 'com.zenithaerospace.monitor'
30+
31+
compileSdkVersion 34
32+
ndkVersion "25.2.9519653"
5333

5434
sourceSets {
5535
main.java.srcDirs += 'src/main/kotlin'
5636
}
5737

58-
defaultConfig {
59-
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
38+
defaultConfig {
39+
applicationId "com.zenithaerospace.monitor"
40+
minSdkVersion 23
41+
targetSdkVersion 31
42+
multiDexEnabled true
43+
versionCode flutterVersionCode.toInteger()
44+
versionName flutterVersionName
45+
// manifestPlaceholders = [MAPS_API_KEY: mapsApiKey]
46+
}
6047

48+
buildTypes {
49+
release {
50+
// Configuração de assinatura para o build de release
51+
// (Substitua com sua própria configuração de assinatura)
52+
signingConfig signingConfigs.debug
53+
}
54+
}
6155

62-
applicationId "com.zenithaerospace.monitor"
63-
minSdkVersion 21
64-
targetSdkVersion 31
65-
multiDexEnabled true
66-
versionCode flutterVersionCode.toInteger()
67-
versionName flutterVersionName
68-
manifestPlaceholders = [MAPS_API_KEY: mapsApiKey]
69-
}
70-
71-
buildTypes {
72-
release {
73-
// TODO: Add your own signing config for the release build.
74-
// Signing with the debug keys for now, so `flutter run --release` works.
75-
signingConfig signingConfigs.debug
76-
}
77-
}
78-
compileOptions {
79-
sourceCompatibility 1.8
80-
targetCompatibility 1.8
81-
}
56+
compileOptions {
57+
sourceCompatibility JavaVersion.VERSION_17
58+
targetCompatibility JavaVersion.VERSION_17
59+
}
8260
}
8361

8462
flutter {
85-
source '../..'
63+
source '../..'
8664
}
8765

8866
dependencies {
89-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
90-
implementation platform('com.google.firebase:firebase-bom:28.4.1')
91-
implementation 'com.google.firebase:firebase-auth'
92-
implementation 'com.google.android.gms:play-services-auth:19.2.0'
93-
implementation 'com.android.support:multidex:1.0.3'
67+
implementation platform('com.google.firebase:firebase-bom:33.1.2')
68+
implementation 'com.google.firebase:firebase-auth'
69+
implementation 'com.google.android.gms:play-services-auth:19.2.0'
70+
implementation 'com.android.support:multidex:1.0.3'
9471
}

android/app/google-services.json

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

android/build.gradle

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
buildscript {
2-
ext.kotlin_version = '1.6.10'
3-
repositories {
4-
google()
5-
jcenter()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
classpath 'com.google.gms:google-services:4.3.8' // Google Services' plugin
12-
}
13-
}
14-
151
allprojects {
162
repositories {
173
google()
@@ -21,10 +7,26 @@ allprojects {
217

228
rootProject.buildDir = '../build'
239
subprojects {
10+
afterEvaluate { project ->
11+
if (project.hasProperty('android')) {
12+
project.android {
13+
if (namespace == null) {
14+
namespace project.group
15+
}
16+
// Avoid adding android.defaults.buildfeatures.buildconfig=true
17+
// to your gradle.properties file because that property is deprecated in AGP 8.0 and is scheduled to be removed in AGP 9.0.
18+
buildFeatures {
19+
if (buildConfig == null) {
20+
buildConfig true
21+
}
22+
}
23+
}
24+
}
25+
}
2426
project.buildDir = "${rootProject.buildDir}/${project.name}"
2527
project.evaluationDependsOn(':app')
2628
}
2729

2830
task clean(type: Delete) {
2931
delete rootProject.buildDir
30-
}
32+
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jun 23 08:50:38 CEST 2017
1+
#Tue Jul 16 09:50:51 BRT 2024
22
distributionBase=GRADLE_USER_HOME
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
34
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
6+
zipStoreBase=GRADLE_USER_HOME

android/settings.gradle

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
29

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
511

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
818

9-
def flutterSdkPath = properties.getProperty("flutter.sdk")
10-
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11-
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "8.0.2" apply false
22+
id "org.jetbrains.kotlin.android" version "1.8.10" apply false
23+
id "com.google.gms.google-services" version "4.4.2" apply false
24+
}
25+
26+
include ":app"

assets/images/devicon_google.png

841 Bytes
Loading

0 commit comments

Comments
 (0)