Skip to content

Commit bb12418

Browse files
otopbaotopba
authored
Merge pull request flutter#2 from flutter/master
Update master
2 parents 073fca5 + 230c53f commit bb12418

136 files changed

Lines changed: 3048 additions & 1622 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
.pub/
88
.dart_tool/
99
pubspec.lock
10+
flutter_export_environment.sh
1011

1112
examples/all_plugins/pubspec.yaml
1213

‎examples/all_plugins/android/app/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
gradle.startParameter.showStacktrace = org.gradle.api.logging.configuration.ShowStacktrace.ALWAYS
2+
13
def localProperties = new Properties()
24
def localPropertiesFile = rootProject.file('local.properties')
35
if (localPropertiesFile.exists()) {

‎examples/all_plugins/android/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
gradle.startParameter.showStacktrace = org.gradle.api.logging.configuration.ShowStacktrace.ALWAYS
2+
13
buildscript {
24
repositories {
35
google()

‎packages/camera/android/build.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ android {
4444
lintOptions {
4545
disable 'InvalidPackage'
4646
}
47+
compileOptions {
48+
sourceCompatibility = '1.8'
49+
targetCompatibility = '1.8'
50+
}
4751
dependencies {
4852
implementation 'androidx.annotation:annotation:1.0.0'
53+
implementation 'androidx.core:core:1.0.0'
4954
}
5055
}

0 commit comments

Comments
 (0)