heronsystems · BobbyHoltzner · Mar 5, 2018 · Mar 25, 2018 · Apr 25, 2018 · Apr 25, 2018
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,33 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/code
+    docker:
+      - image: circleci/android:api-25-alpha
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - run: yes | sdkmanager --licenses || true
+      - run: yes | sdkmanager --update || exit 0
+      - checkout
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "./build.gradle" }}
+#      - run:
+#         name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
+#         command: sudo chmod +x ./gradlew
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "./build.gradle" }}
+      - run:
+          name: Run Tests
+          command: ./gradlew test
+      - store_artifacts:
+          path: ./build/reports
+          destination: reports
+      - store_test_results:
+          path: ./build/test-results
+      # See https://circleci.com/docs/2.0/deployment-integrations/ for deploy examples
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,12 @@
 language: java
 
-jdk: oraclejdk7
+jdk: oraclejdk8
 
 before_install:
   - export TERM=dumb
   - cp gradle.properties.dist gradle.properties
   - sudo apt-get install -qq libstdc++6:i386 lib32z1
-  - export COMPONENTS=build-tools-19.0.3,android-19,extra-android-m2repository
+  - export COMPONENTS=build-tools-28.0.3,android-28,extra-android-m2repository
   - curl -L https://raw.github.com/embarkmobile/android-sdk-installer/version-1/android-sdk-installer | bash /dev/stdin --install=$COMPONENTS
   - source ~/.android-sdk-installer/env
 install:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,86 @@
+### Development
+
+- Fix thread leak with 0 regions and settings applied, (#888, David G. Young)
+- Prevent NPE when ScanState restore hangs or ScanJob thread is slow to start (#890, David G. Young)
+- Prevent crash from IAE when ending scan cycle (#891, David G. Young)
+- Prevent NPE in BluetoothMedic#runScanTest. (#893 Van Hoang Tran)
+
+### 2.16.2 / 2019-05-29
+
+- Prevent crash on alarms going off with a different user active (#886, David G. Young)
+- Fix thread leak caused by scheduling ScanJob when no consumers bound. (#885, David G. Young)
+- Protect against a NPE when changing ranged regions.  (#770, David G. Young)
+- Fix intermittent failed ranging/monitoring callbacks in race conditions. (#842, David G. Young) 
+- Prevent duplicate callbacks on Android 8+ with a foreground service by stopping ScanJob.  (#847, Stephen Ruda)
+- Only apply Samsung-specific non-empty scan filters when the screen is off (#855, Marcel Schnelle)
+
+### 2.16.1 / 2019-02-10
+
+- Fix crash on starting scanning with a forground service configured when multiple BeaconConsumer
+  instances bound.  (#828, David G. Young)
+- Fix broken RegionBoostrap callbacks caused by change in previous release (#829, David G. Young)
+
+### 2.16 / 2019-02-10
+
+- New Region Bootstrap constructors allowing separate context and notifir (#821, Alper Tekin)
+- Fix intermittent crash caused by internal Android NPE (#824, kababu007)
+- Update gradle and robolectric (#805, Tony Tang)
+- Fix problem on service shutdown that leaked threads and left scanning on (#804, David G. Young)
+
+### 2.15.4 / 2018-12-11
+
+- Fix crash on BluetoothCrashResolver (#790, Michael Porter)
+
+### 2.15.3 / 2018-12-11
+
+- Samsung screen-off scans on Android 8.1+ fixed.  (#798, David G. Young)
+- Fix bug preventing callbacks after unbind/bind when using ScanJobs.  (#765, David G. Young)
+- Prevent NPE on access CycledLEScanner after OOM on Android 8+.  (#766, David G. Young)
+- Make switching back and forth between a foreground service and scan jobs more reliable
+(#767, David G. Young)
+- Disable BluetoothCrashResolver on Android 5+ as a it is not helpful can can create log noise.
+   (#768, David G. Young)
+- Prevent NPE on start scan. (#780, Adrián Nieto Rodríguez)
+- Fix thread leak leading to OOM Exceptions when using ScanJobs (#785, David G. Young)
+
+### 2.15.2 / 2018-10-17
+
+- Prevent infrequent out of memory crashes on Android 8+ (#750 Pappas Christodoulos, David G. Young)
+- Prevent duplicate ranging/monitoring callbacks casued by bind/unbind with a service
+  (#748, Adrián Nieto Rodríguez, #745, David G. Young)
+- Allow starting foreground service at boot (#746, David G. Young)
+- Re-enable broken BeaconSimulator (#751, David G. Young)
+
+### 2.15.1 / 2018-09-01
+
+ - Prevent crash caused by internal Android exception when stopping scanning (#724, David G. Young)
+ - Fix Android 8 crashing apps on background monitoring/ranging data delivery (#720, David G. Young)
+ - Fix intermittent NPE on ranging beacons (#716, Federico Bertoli, David G. Young)
+ - Stop running scheduled jobs to do scans after last consumer unbound. (#702, David G. Young)
+
+### 2.15 / 2018-07-04
+
+Enhancements:
+ - Optional foreground beacon scanning service for faster background detections on Android 8+
+   (#663, David G. Young)
+
+Bug Fixes:
+ - Fixes inability to detect on some 5.x Samsung Devices without scan filters. (#693, David G. Young)
+ - Fix inverted logic for "disable ScanJob" warning (#700, Marcel Schnelle)
+ - Fix crash on scanning an Eddystone-URL packet with a negative-length URL. (#703, David G. Young)
+
+### 2.14 / 2018-05-17
+
+Enhancements:
+
+ - Add warnings about disabling scheduled scan jobs on Android 8+ (#674, David G. Young)
+ - Add warning about setting short scan periods on Android 8 (#677, David G. Young)
+ - BeaconTransmitter advertisements may be configured as connectable (#683, Michael Harper)
+
+Bug Fixes:
+ - Fix crashes of BluetoothMedic caused by Bluetooth being turned off (#675, David G. Young) 
+ - Fix flawed in BeaconManager.isBound method on Android 8 (#655, David G. Young)
+
 ### 2.13.1 / 2018-03-05
 
 [Full Changelog](https://github.com/AltBeacon/android-beacon-library/compare/2.13.1...2.13)

diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ to use the JCenter Repository
 ```groovy
 dependencies {
     ...
-    compile 'org.altbeacon:android-beacon-library:${altbeacon.version}'
+    implementation 'org.altbeacon:android-beacon-library:${altbeacon.version}'
     ...
 }
 ```
@@ -58,14 +58,14 @@ replacing `${altbeacon.version}` with the version you wish to use.
 ## How to build this Library
 
 This project uses an AndroidStudio/gradle build system and is known working with Android Studio
-2.1 and Gradle 2.2.1
+3.4.1 and Gradle 5.1.1
 
 Key Gradle build targets:
 
     ./gradlew test # run unit tests
     ./gradlew build # development build
     ./gradlew release -Prelease # release build
-    ./gradlew generatereleaseJavadoc -Prelease
+    ./gradlew generateReleaseJavadoc
 
 ## License
 

diff --git a/build.gradle b/build.gradle
@@ -1,176 +1,30 @@
-ext {
-    isSnapshot = !project.hasProperty('release')
-    isSnapCi = System.getenv('SNAP_CI') != null
-    isSnapPullRequest = System.getenv('SNAP_PULL_REQUEST_NUMBER') != null
-}
-
-/*
- * Gets the version name from the latest Git tag
- */
-def getVersionName = {
-    def stdout = new ByteArrayOutputStream()
-    try {
-        exec {
-            commandLine 'git', 'describe', '--tags'
-            standardOutput = stdout
-        }
-        return stdout.toString().trim()
-    }
-    catch (e) {
-        println("Can't get version from git: " + e);
-        return "adhoc"
-    }
-}
-
 buildscript {
     repositories {
+        google()
         jcenter()
-        maven {
-            url 'https://maven.google.com'
-        }
-        maven {
-            url 'https://dl.google.com/dl/android/maven2/'
+        mavenCentral()
+        repositories {
+            maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
         }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.android.tools.build:gradle:3.4.1'
+        //noinspection GradleDependency
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1'
+        //noinspection GradleDependency
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.3'
+        // The 3.0 version of this plugin does not support Gradle 5, The latest source does support
+        // Grale 5. So we are using a snapshot until the 4.0 version is released.
+        //classpath "com.vanniktech:gradle-android-javadoc-plugin:0.3.0"
+        dependencies {
+            classpath "com.vanniktech:gradle-android-javadoc-plugin:0.4.0-SNAPSHOT"
+        }
     }
 }
-
-apply plugin: 'com.android.library'
-
-apply from: 'gradle/eclipse.gradle'
-
 allprojects {
-    version = "${getVersionName()}${isSnapshot == true ? "-SNAPSHOT" : ""}"
-    group = "org.altbeacon"
-
     repositories {
+        google()
         jcenter()
-        maven {
-            url 'https://maven.google.com'
-        }
-        maven {
-            url 'https://dl.google.com/dl/android/maven2/'
-        }
-    }
-}
-
-android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.2'
-
-    defaultConfig {
-        // 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
-        consumerProguardFiles 'proguard-rules.pro'
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        encoding "UTF-8"
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
     }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    packagingOptions {
-        exclude 'LICENSE.txt'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE'
-    }
-}
-
-dependencies {
-    compile fileTree ( dir: 'libs', include: ['*.jar'] )
-    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'
-    }
-    testCompile('org.hamcrest:hamcrest-junit:2.0.0.0') {
-        exclude group: 'junit'
-    }
-    testCompile('com.squareup:fest-android:1.0.+@aar')
-    testCompile('org.robolectric:robolectric:3.0') {
-        exclude group: 'junit'
-    }
-    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'
-
-idea {
-    module {
-        testOutputDir = file('build/test-classes/debug')
-    }
-}
-
-task renameAarForRelease(type: Copy, dependsOn: build) {
-    description = "Rename the aar for easy release publishing"
-
-    from "$buildDir/outputs/aar/" //${project.name}-release.aar
-    into "$buildDir/outputs/aar/" //${project.name}-${project.version}.aar"
-    include "${project.name}-release.aar"
-    rename { String fileName ->
-        fileName = "${project.name}-${project.version}.aar"
-    }
-}
-
-task distribution(dependsOn: [bundleEclipse, build, clean, renameAarForRelease]) << {
-    println "Building with version=$version"
-}
-
-task release(dependsOn: 'distribution') << {
-    println('Doing release build')
-}
-
-android.libraryVariants.all { variant ->
-
-    task("generate${variant.name}Javadoc", type: Javadoc) {
-        title = "Android Beacon Library $version API"
-        description "Generates Javadoc for $variant.name."
-        source = variant.javaCompile.source
-        ext.androidJar =
-                "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
-        classpath = files(variant.javaCompile.classpath.files, ext.androidJar)
-        options.linksOffline "http://d.android.com/reference/", "${android.sdkDirectory}/docs/reference"
-        exclude '**/BuildConfig.java'
-        exclude '**/R.java'
-    }
-
-}
-
-build.mustRunAfter clean
-
-apply from: 'gradle/credentials.gradle'
-apply from: 'gradle/compile.gradle'
-apply from: 'gradle/publishing.gradle'
-apply from: 'gradle/bintray.gradle'
-apply from: 'gradle/artifactory.gradle'
-
-artifactoryPublish {
-    // Skip deploying to artifactory if building a pull request
-    onlyIf { !isSnapPullRequest }
 }
diff --git a/circle.yml b/circle.yml
@@ -3,7 +3,7 @@ machine:
     version: openjdk8
 dependencies:
   pre:
-    - 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"
+    - echo y | android update sdk --no-ui --all --filter "tools,android-28,build-tools-28.0.3,platform-tools,extra-android-m2repository,extra-google-m2repository"
 general:
   branches:
     ignore:
diff --git a/eclipse-support/project.properties b/eclipse-support/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-28
 android.library=true
diff --git a/gradle.properties b/gradle.properties
@@ -8,3 +8,4 @@ project_connection = scm:git:https://github.com/AltBeacon/android-beacon-library
 project_dev_connection = scm:git:[email protected]:AltBeacon/android-beacon-library.git
 project_bintray_repo = android
 project_bintray_org = altbeacon
+android.enableUnitTestBinaryResources=true