From 489ba8ba48ae6898b339bc18c233bbd1c12f20f9 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Tue, 5 Mar 2019 15:35:14 +0100 Subject: [PATCH 1/6] update .gitignore & removed unnecessary files --- .idea/libraries/Dart_SDK.xml | 19 --------- .idea/libraries/Flutter_Plugins.xml | 10 ----- .idea/libraries/Flutter_for_Android.xml | 9 ----- .idea/misc.xml | 4 -- .idea/modules.xml | 9 ----- .../example_lib_main_dart.xml | 6 --- example/.flutter-plugins | 3 ++ example/.gitignore | 11 +++++- example/.idea/libraries/Dart_SDK.xml | 19 --------- .../.idea/libraries/Flutter_for_Android.xml | 9 ----- example/.idea/modules.xml | 9 ----- example/.idea/runConfigurations/main_dart.xml | 6 --- example/.idea/workspace.xml | 36 ------------------ .../.idea/caches/build_file_checksums.ser | Bin 892 -> 0 bytes example/android/.idea/codeStyles/Project.xml | 29 -------------- example/android/.idea/gradle.xml | 21 ---------- example/android/.idea/misc.xml | 34 ----------------- example/android/.idea/modules.xml | 12 ------ example/android/.idea/runConfigurations.xml | 12 ------ 19 files changed, 13 insertions(+), 245 deletions(-) delete mode 100644 .idea/libraries/Dart_SDK.xml delete mode 100644 .idea/libraries/Flutter_Plugins.xml delete mode 100644 .idea/libraries/Flutter_for_Android.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/runConfigurations/example_lib_main_dart.xml create mode 100644 example/.flutter-plugins delete mode 100644 example/.idea/libraries/Dart_SDK.xml delete mode 100644 example/.idea/libraries/Flutter_for_Android.xml delete mode 100644 example/.idea/modules.xml delete mode 100644 example/.idea/runConfigurations/main_dart.xml delete mode 100644 example/.idea/workspace.xml delete mode 100644 example/android/.idea/caches/build_file_checksums.ser delete mode 100644 example/android/.idea/codeStyles/Project.xml delete mode 100644 example/android/.idea/gradle.xml delete mode 100644 example/android/.idea/misc.xml delete mode 100644 example/android/.idea/modules.xml delete mode 100644 example/android/.idea/runConfigurations.xml diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml deleted file mode 100644 index a12d548..0000000 --- a/.idea/libraries/Dart_SDK.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml deleted file mode 100644 index b4f5d54..0000000 --- a/.idea/libraries/Flutter_Plugins.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Flutter_for_Android.xml b/.idea/libraries/Flutter_for_Android.xml deleted file mode 100644 index 6e6c9a4..0000000 --- a/.idea/libraries/Flutter_for_Android.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index ac5bd6f..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index cb9a7ec..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.idea/runConfigurations/example_lib_main_dart.xml b/.idea/runConfigurations/example_lib_main_dart.xml deleted file mode 100644 index 5fd9159..0000000 --- a/.idea/runConfigurations/example_lib_main_dart.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/example/.flutter-plugins b/example/.flutter-plugins new file mode 100644 index 0000000..cb6f1c2 --- /dev/null +++ b/example/.flutter-plugins @@ -0,0 +1,3 @@ +beacons=C:\\Users\\daniel\\Documents\\GitHub\\beacons\\ +flutter_local_notifications=C:\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\flutter_local_notifications-0.2.9\\ +streams_channel=C:\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\streams_channel-0.2.2\\ diff --git a/example/.gitignore b/example/.gitignore index dee655c..fcf48ea 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -1,9 +1,18 @@ +# Flutter/Dart/Pub related .DS_Store .dart_tool/ .packages .pub/ +pubspec.lock build/ -.flutter-plugins +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# Visual Studio Code related +.vscode/ diff --git a/example/.idea/libraries/Dart_SDK.xml b/example/.idea/libraries/Dart_SDK.xml deleted file mode 100644 index a12d548..0000000 --- a/example/.idea/libraries/Dart_SDK.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/example/.idea/libraries/Flutter_for_Android.xml b/example/.idea/libraries/Flutter_for_Android.xml deleted file mode 100644 index 6e6c9a4..0000000 --- a/example/.idea/libraries/Flutter_for_Android.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/example/.idea/modules.xml b/example/.idea/modules.xml deleted file mode 100644 index 602cb73..0000000 --- a/example/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/example/.idea/runConfigurations/main_dart.xml b/example/.idea/runConfigurations/main_dart.xml deleted file mode 100644 index aab7b5c..0000000 --- a/example/.idea/runConfigurations/main_dart.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/example/.idea/workspace.xml b/example/.idea/workspace.xml deleted file mode 100644 index 5b3388c..0000000 --- a/example/.idea/workspace.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/example/android/.idea/caches/build_file_checksums.ser b/example/android/.idea/caches/build_file_checksums.ser deleted file mode 100644 index 7191e419e7a3422c8fede79208ae1597c2dc7bd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 892 zcmb7COGs5g82-EB|Uc% zf;K_BmIW;<3u~d$Vf{qUnfDjpqM;6ZC%{A?97#_&;A3ytq(EZ;WG%7|N9XD<2x=gI%)@*`1rw?A((VQH+ zHkDtI^QP__!l{k8O{|{@={d|rBPM-sUFo{5N-$~$DmTH2z9_#nn^>CV3$5cr$&5lM z`L(~lO=MzaJpFO(?wyB?XYRGN*G?l;Y-F`IaN{2}CQGxU*XNrrFLzxny%c*e6s!RC ZyuY-6WU9>{T3jA1FI#ysv;Tf|<~!K>LKy%6 diff --git a/example/android/.idea/codeStyles/Project.xml b/example/android/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/example/android/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/example/android/.idea/gradle.xml b/example/android/.idea/gradle.xml deleted file mode 100644 index 05d0870..0000000 --- a/example/android/.idea/gradle.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/example/android/.idea/misc.xml b/example/android/.idea/misc.xml deleted file mode 100644 index ac59544..0000000 --- a/example/android/.idea/misc.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/example/android/.idea/modules.xml b/example/android/.idea/modules.xml deleted file mode 100644 index 0990a1a..0000000 --- a/example/android/.idea/modules.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/example/android/.idea/runConfigurations.xml b/example/android/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/example/android/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file From ff06939c432d94915c0915848de4fb6e36adb6c7 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Tue, 5 Mar 2019 15:52:20 +0100 Subject: [PATCH 2/6] changed deprecated org.jetbrains.kotlin:kotlin-stdlib-jre7 --- .idea/vcs.xml | 6 ++++++ example/android/app/build.gradle | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index a5d0d22..96e2c15 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -50,7 +50,7 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' From c4c2cefbcd5dd204fb26acc32c635bbbe36e6012 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Tue, 5 Mar 2019 15:56:45 +0100 Subject: [PATCH 3/6] update app compat and compile sdk --- android/build.gradle | 10 +++++----- example/android/app/build.gradle | 4 ++-- example/android/build.gradle | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index a0e4026..accf134 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ group 'io.intheloup.beacons' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.2.41' + ext.kotlin_version = '1.2.51' repositories { google() jcenter() @@ -25,7 +25,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 27 + compileSdkVersion 28 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -46,11 +46,11 @@ kotlin { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.22.5" - implementation "com.android.support:support-compat:27.1.1" - implementation "com.android.support:support-core-utils:27.1.1" + implementation "com.android.support:support-compat:28.0.0" + implementation "com.android.support:support-core-utils:28.0.0" implementation "org.altbeacon:android-beacon-library:2.14" implementation "com.squareup.moshi:moshi:1.5.0" diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 96e2c15..1eb9dd3 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 27 + compileSdkVersion 28 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -30,7 +30,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.intheloup.beaconsexample" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/example/android/build.gradle b/example/android/build.gradle index 866932a..187c481 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.2.41' + ext.kotlin_version = '1.2.51' repositories { google() jcenter() From 80fdccf1849e699cc29230d05a6c7238871794a4 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Tue, 5 Mar 2019 16:00:14 +0100 Subject: [PATCH 4/6] ext.kotlin_version = '1.2.71' --- android/build.gradle | 2 +- example/android/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index accf134..8d06f43 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ group 'io.intheloup.beacons' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.2.51' + ext.kotlin_version = '1.2.71' repositories { google() jcenter() diff --git a/example/android/build.gradle b/example/android/build.gradle index 187c481..b6ae951 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.2.51' + ext.kotlin_version = '1.2.71' repositories { google() jcenter() From 285c47719dde055a905a499fd4aa0ab54ff8a840 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Tue, 5 Mar 2019 16:42:19 +0100 Subject: [PATCH 5/6] changelog + version info --- CHANGELOG.md | 6 ++++++ pubspec.yaml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d2e310..8ce0316 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [0.3.1] + +* Fix: flutter compatibility with v1.2.1 + * updated deprecated kotlin dependencies + * updated android support library + ## [0.3.0] * Fix: Background monitoring on Android diff --git a/pubspec.yaml b/pubspec.yaml index 3376197..72c7acd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: beacons description: Flutter beacons plugin for iOS and Android. -version: 0.3.0 +version: 0.3.1 author: Loup Inc. homepage: https://github.com/loup-v/beacons From 44944fedc4150ede028898f531b1664fb99ec135 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Tue, 5 Mar 2019 16:56:34 +0100 Subject: [PATCH 6/6] update gitignore --- .gitignore | 11 ++++++++++- .idea/vcs.xml | 6 ------ example/.flutter-plugins | 3 --- example/.gitignore | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 .idea/vcs.xml delete mode 100644 example/.flutter-plugins diff --git a/.gitignore b/.gitignore index 2f74e22..4225de6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,19 @@ +# Flutter/Dart/Pub related .DS_Store .dart_tool/ +.flutter-plugins .packages .pub/ pubspec.lock build/ -.idea/workspace.xml \ No newline at end of file +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# Visual Studio Code related +.vscode/ diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/example/.flutter-plugins b/example/.flutter-plugins deleted file mode 100644 index cb6f1c2..0000000 --- a/example/.flutter-plugins +++ /dev/null @@ -1,3 +0,0 @@ -beacons=C:\\Users\\daniel\\Documents\\GitHub\\beacons\\ -flutter_local_notifications=C:\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\flutter_local_notifications-0.2.9\\ -streams_channel=C:\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\streams_channel-0.2.2\\ diff --git a/example/.gitignore b/example/.gitignore index fcf48ea..4225de6 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -2,6 +2,7 @@ .DS_Store .dart_tool/ +.flutter-plugins .packages .pub/ pubspec.lock