Skip to content

Commit aba3565

Browse files
authored
Merge pull request #15 from mateusfccp/master
Upgrade rxdart dependency, example to androidx
2 parents 346432c + 5434238 commit aba3565

File tree

39 files changed

+255
-291
lines changed

39 files changed

+255
-291
lines changed

.idea/libraries/Dart_SDK.xml

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.metadata

Lines changed: 2 additions & 2 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: 5391447fae6209bb21a89e6a5a6583cac1af9b4b
8-
channel: dev
7+
revision: 27321ebbad34b0a3fafe99fac037102196d655ff
8+
channel: stable
99

1010
project_type: package

android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

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

docs/hydrated.gif

-1010 KB
Binary file not shown.

docs/tests.gif

-307 KB
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]}]}

example/.metadata

Lines changed: 2 additions & 2 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: 5391447fae6209bb21a89e6a5a6583cac1af9b4b
8-
channel: dev
7+
revision: 27321ebbad34b0a3fafe99fac037102196d655ff
8+
channel: stable
99

1010
project_type: app

example/android/.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
gradle-wrapper.jar
2+
/.gradle
3+
/captures/
4+
/gradlew
5+
/gradlew.bat
6+
/local.properties
7+
GeneratedPluginRegistrant.java

example/android/app/build.gradle

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,28 @@ if (flutterVersionName == null) {
2222
}
2323

2424
apply plugin: 'com.android.application'
25+
apply plugin: 'kotlin-android'
2526
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2627

2728
android {
28-
compileSdkVersion 27
29+
compileSdkVersion 28
30+
31+
sourceSets {
32+
main.java.srcDirs += 'src/main/kotlin'
33+
}
2934

3035
lintOptions {
3136
disable 'InvalidPackage'
3237
}
3338

3439
defaultConfig {
3540
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
36-
applicationId "com.example.hydrateddemo"
41+
applicationId "com.example.example"
3742
minSdkVersion 16
38-
targetSdkVersion 27
43+
targetSdkVersion 28
3944
versionCode flutterVersionCode.toInteger()
4045
versionName flutterVersionName
41-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
46+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4247
}
4348

4449
buildTypes {
@@ -55,7 +60,8 @@ flutter {
5560
}
5661

5762
dependencies {
63+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
5864
testImplementation 'junit:junit:4.12'
59-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
60-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
65+
androidTestImplementation 'androidx.test:runner:1.1.1'
66+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
6167
}

0 commit comments

Comments
 (0)