Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

flutter compatibility with v1.2.1 #30

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
# Flutter/Dart/Pub related
.DS_Store
.dart_tool/

.flutter-plugins
.packages
.pub/
pubspec.lock

build/

.idea/workspace.xml
# IntelliJ related
*.iml
*.ipr
*.iws
.idea/

# Visual Studio Code related
.vscode/
19 changes: 0 additions & 19 deletions .idea/libraries/Dart_SDK.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/libraries/Flutter_Plugins.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/libraries/Flutter_for_Android.xml

This file was deleted.

4 changes: 0 additions & 4 deletions .idea/misc.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/runConfigurations/example_lib_main_dart.xml

This file was deleted.

6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group 'io.intheloup.beacons'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.2.41'
ext.kotlin_version = '1.2.71'
repositories {
google()
jcenter()
Expand All @@ -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'
Expand All @@ -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"

Expand Down
12 changes: 11 additions & 1 deletion example/.gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
# Flutter/Dart/Pub related
.DS_Store
.dart_tool/

.flutter-plugins
.packages
.pub/
pubspec.lock

build/

.flutter-plugins
# IntelliJ related
*.iml
*.ipr
*.iws
.idea/

# Visual Studio Code related
.vscode/
19 changes: 0 additions & 19 deletions example/.idea/libraries/Dart_SDK.xml

This file was deleted.

9 changes: 0 additions & 9 deletions example/.idea/libraries/Flutter_for_Android.xml

This file was deleted.

9 changes: 0 additions & 9 deletions example/.idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions example/.idea/runConfigurations/main_dart.xml

This file was deleted.

36 changes: 0 additions & 36 deletions example/.idea/workspace.xml

This file was deleted.

Binary file removed example/android/.idea/caches/build_file_checksums.ser
Binary file not shown.
29 changes: 0 additions & 29 deletions example/android/.idea/codeStyles/Project.xml

This file was deleted.

21 changes: 0 additions & 21 deletions example/android/.idea/gradle.xml

This file was deleted.

34 changes: 0 additions & 34 deletions example/android/.idea/misc.xml

This file was deleted.

12 changes: 0 additions & 12 deletions example/android/.idea/modules.xml

This file was deleted.

12 changes: 0 additions & 12 deletions example/android/.idea/runConfigurations.xml

This file was deleted.

6 changes: 3 additions & 3 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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"
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.2.41'
ext.kotlin_version = '1.2.71'
repositories {
google()
jcenter()
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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. <[email protected]>
homepage: https://github.com/loup-v/beacons

Expand Down