Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…library into HEAD

merging altbeacon update
  • Loading branch information
jsochurek committed May 9, 2018
2 parents ec36b8f + f350af4 commit e6a6ffa
Show file tree
Hide file tree
Showing 61 changed files with 5,007 additions and 939 deletions.
119 changes: 118 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,121 @@
### Development
### 2.13.1 / 2018-03-05

[Full Changelog](https://github.com/AltBeacon/android-beacon-library/compare/2.13.1...2.13)

Bug Fixes:
- Fix incorrect immediateScanJobId meta-data name in manifest causing crash (#653, David G. Young)


### 2.13 / 2018-03-05

[Full Changelog](https://github.com/AltBeacon/android-beacon-library/compare/2.12.4...2.13)

Enhancements:
- Add BluetoothMedic to fix crashing bluetooth stacks. (#644, David G. Young)
- Allow configuring job ids (#645, David G. Young)

Bug Fixes:
- Allow scans with screen off on Android 8.1 (#637, David G. Young)

### 2.12.4 / 2017-12-16

[Full Changelog](https://github.com/AltBeacon/android-beacon-library/compare/2.12.3...2.12.4)

Bug Fixes:
- Fix performance problems when using identifiers 3-15 bytes caused by
Identifier#toHexString(). (#615, David G. Young)
- Restore missing runningAverageRssi values (#621, David G. Young)
- Fix NPE on ExtraBeaconDataTracker (#626, David G. Young)
- Fix regression with `RunningAverageRssiFilter.setSampleExpirationMilliseconds`
being overwritten when committing ranged beacon measurements. (#629, Aaron Kromer)
- Fix missing running average RSSI in callbacks when apps do not use the
scheduled scan job feature. (#630, Aaron Kromer)
- Fix copying of multi-frame beacon flag in `Beacon(Beacon)` constructor (#630, Aaron Kromer)
- Fix the `AltBeaon(Beacon)` copy constructor which omitted some data fields (#630, Aaron Kromer)

### 2.12.3 / 2017-10-14

[Full Changelog](https://github.com/AltBeacon/android-beacon-library/compare/2.12.2...2.12.3)

Bug Fixes:
- Fix NullPointerException in ProcessUtils. (#598, David G. Young)
- Fix ConcurrentModificationException crashing app on Android 8 when monitored regions are
changed at the same time the app shifts from active scanning to passive scanning.
(#578, David G. Young)
- Fix ConcurrentModifictionExceptions starting ScanJobs. (#584, #588, David G. Young)
- Fix NullPointerException when BluetoothLeScanner cannot be obtained.
(#583, David G. Young)

### 2.12.2 / 2017-08-31

[Full Changelog](https://github.com/AltBeacon/android-beacon-library/compare/2.12.1...2.12.2)

Bug Fixes:
- Fix stack overflow caused by scan period of zero seconds, caused by 2.12 upgrade of existing
apps. (#572, David G. Young)
- Suppress error log on ScanState deserialization if file does not exist yet.
(#570, David G. Young)
- Turn off scanning after unbind, which was previously left on forever in some cases.
(#569, David G. Young)

### 2.12.1 / 2017-08-16

[Full Changelog](https://github.com/AltBeacon/android-beacon-library/compare/2.12...2.12.1)


Bug Fixes:
- Fix crash on Android 8.0 background scan when bluetooth is off.
(#562 Juliane Lehmann)
- Fix "Scanning too frequently" error with non-zero betweenScanPeriod
and scanPeriod+betweenScanPeriod < 6000, and full-power scanning
staying on for foreground scans with a non-zero betweenScanPeriod
(#555, David G. Young)


### 2.12 / 2017-08-07

[Full Changelog](https://github.com/AltBeacon/android-beacon-library/compare/2.11...2.12)

Enhancements:
- Add Android O support with ScanJob using JobScheduler to do scans instead of BeaconService,
set as default for Android O. (#484, David G. Young)

Bug Fixes:

- Correct accessor method for Beacon#getRunningAverageRssi()
(#536, Pietro De Caro)

### 2.11 / 2017-06-28

[Full Changelog](https://github.com/AltBeacon/android-beacon-library/compare/2.10...2.11)

Enhancements:

- Add ability to circumvent prohibition against scans running for > 30 minutes on Android N.
(#529, David G. Young)
- Add support for running the beacon scanning service in a separate process and working with
application setups that have more than one process. (#479, David G. Young)

Bug Fixes:

- Fix Google Play submission errors by no longer using uses-permission-sdk-23 in
Manifest (#527, David G. Young)
- Fix inability to use `RunningAverageRssiFilter.setSampleExpirationMilliseconds(...)` (#523,
David G. Young)
- Fix failure to restart scanning in some cases after bluetooth has been off but then is turned
back on. (#519, David G. Young)
- Fix failure to stop scanning when unbinding from service or when the between scan period
is nonzero. (#507, David G. Young)
- Fix possible `NullPointerException` with `BackgroundPowerSaver` on devices
prior to Android 4.3 Jelly Bean MR 2 (API 18) (#516, Aaron Kromer)
- Fix rare edge case causing `NoSuchElementException` when using the legacy
`BeaconManager#getMonitoringNotifier` and `BeaconManager#getRangingNotifier`
where the notifier sets were modified external to `BeaconManager` by another
thread (#516, Aaron Kromer)

### 2.10 / 2017-04-21

[Full Changelog](https://github.com/AltBeacon/android-beacon-library/compare/2.9.2...2.10)

Enhancements:

Expand Down
36 changes: 29 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,16 @@ def getVersionName = {
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com'
}
maven {
url 'https://dl.google.com/dl/android/maven2/'
}
}

dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.3'
}
Expand All @@ -44,20 +50,30 @@ allprojects {

repositories {
jcenter()
maven {
url 'https://maven.google.com'
}
maven {
url 'https://dl.google.com/dl/android/maven2/'
}
}
}

android {
compileSdkVersion 24
buildToolsVersion "25.0.2"
compileSdkVersion 26
buildToolsVersion '26.0.2'

defaultConfig {
minSdkVersion 7
targetSdkVersion 23
// Unfortunately 'com.android.support:appcompat-v7:26.0.0'
// requires minSdkVersion 14, forcing a bump verson minSdkVersion 7
// But since only 0.8% of Android devices have < SDK 14 as of Une 2017, this will become
// the new min version for this library in order to target Android O
minSdkVersion 14
targetSdkVersion 26
versionCode 1
versionName version
testInstrumentationRunner "com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner"
consumerProguardFiles 'proguard-rules.pro'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

compileOptions {
Expand All @@ -80,7 +96,8 @@ android {

dependencies {
compile fileTree ( dir: 'libs', include: ['*.jar'] )
compile 'com.android.support:support-annotations:24.2.1'
compile 'com.android.support:appcompat-v7:26.0.0'
compile 'com.android.support:support-annotations:26.0.0'

testCompile('junit:junit:4.12') {
exclude group: 'org.hamcrest'
Expand All @@ -95,6 +112,11 @@ dependencies {
testCompile('org.mockito:mockito-core:1.10.19') {
exclude group: 'org.hamcrest'
}
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
exclude group: 'org.hamcrest'
})
androidTestCompile 'org.apache.commons:commons-math3:3.6.1'
}

apply plugin: 'idea'
Expand Down
6 changes: 4 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ machine:
version: openjdk8
dependencies:
pre:
- echo y | android update sdk --no-ui --all --filter "tools,android-24,build-tools-25.0.2,platform-tools,extra-android-m2repository,extra-google-m2repository"

- echo y | android update sdk --no-ui --all --filter "tools,android-26,build-tools-26.0.2,platform-tools,extra-android-m2repository,extra-google-m2repository"
general:
branches:
ignore:
4 changes: 2 additions & 2 deletions gradle/publishing.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ publishing {
version project.version
artifact "${project.buildDir}/outputs/aar/${project.name}-release.aar"
artifact androidJavadocsJar {
classifier 'source'
classifier 'javadoc'
}
artifact androidSourcesJar {
classifier 'javadoc'
classifier 'source'
}

pom.withXml {
Expand Down
5 changes: 4 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
#distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip
#distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-1-all.zip
#distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
Loading

0 comments on commit e6a6ffa

Please sign in to comment.