Skip to content

Commit

Permalink
Fixed Android build error + lag issue
Browse files Browse the repository at this point in the history
  • Loading branch information
MrBananaPants committed Mar 7, 2021
1 parent 8ca8385 commit 7543adf
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 17 deletions.
Binary file added android.zip
Binary file not shown.
10 changes: 3 additions & 7 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,17 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 30

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

lintOptions {
disable 'InvalidPackage'
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.star_tracker"
applicationId "com.example.test2"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 30
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:4.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
1 change: 0 additions & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.enableR8=true
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
1 change: 0 additions & 1 deletion android/settings_aar.gradle

This file was deleted.

40 changes: 40 additions & 0 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
PODS:
- Flutter (1.0.0)
- geolocator (6.2.0):
- Flutter
- location (0.0.1):
- Flutter
- url_launcher (0.0.1):
- Flutter
- weather (0.0.1):
- Flutter

DEPENDENCIES:
- Flutter (from `Flutter`)
- geolocator (from `.symlinks/plugins/geolocator/ios`)
- location (from `.symlinks/plugins/location/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- weather (from `.symlinks/plugins/weather/ios`)

EXTERNAL SOURCES:
Flutter:
:path: Flutter
geolocator:
:path: ".symlinks/plugins/geolocator/ios"
location:
:path: ".symlinks/plugins/location/ios"
url_launcher:
:path: ".symlinks/plugins/url_launcher/ios"
weather:
:path: ".symlinks/plugins/weather/ios"

SPEC CHECKSUMS:
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
geolocator: f5e3de65e241caba7ce3e8a618803387bda73384
location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
weather: a61cb57d3f28e042b84c6ccdf3b3b2b1835530d2

PODFILE CHECKSUM: 8bc275aefbb61176b74a34fbb19fd07e4c46e63c

COCOAPODS: 1.10.1
10 changes: 5 additions & 5 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,21 @@ packages:
name: geolocator
url: "https://pub.dartlang.org"
source: hosted
version: "7.0.1"
version: "6.2.1"
geolocator_platform_interface:
dependency: transitive
description:
name: geolocator_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "1.0.9"
geolocator_web:
dependency: transitive
description:
name: geolocator_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
version: "1.0.1"
http:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -162,7 +162,7 @@ packages:
name: plugin_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "1.0.3"
sky_engine:
dependency: transitive
description: flutter
Expand Down Expand Up @@ -244,7 +244,7 @@ packages:
name: url_launcher_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "2.0.1"
url_launcher_web:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
weather:
url_launcher:
cupertino_icons: ^1.0.0
geolocator: ^7.0.1
geolocator:

dev_dependencies:
http:
Expand Down

0 comments on commit 7543adf

Please sign in to comment.