Merge pull request #96 from NordicSemiconductor/develop

Version 1.4.4

Author: philips77

README.md

@@ -1,6 +1,6 @@
 # Android BLE Scanner Compat library
 
-[ ![Download](https://api.bintray.com/packages/nordic/android/no.nordicsemi.android.support.v18%3Ascanner/images/download.svg) ](https://bintray.com/nordic/android/no.nordicsemi.android.support.v18%3Ascanner/_latestVersion)
+[ ![Download](https://maven-badges.herokuapp.com/maven-central/no.nordicsemi.android.support.v18/scanner/badge.svg?style=plastic) ](https://search.maven.org/artifact/no.nordicsemi.android.support.v18/scanner)
 
 The Scanner Compat library solves the problem with scanning for Bluetooth Low Energy devices on Android. 
 The scanner API, initially created in Android 4.3, has changed in Android 5.0 and has been extended in 6.0 and 8.0. 
@@ -24,15 +24,30 @@ for more details.
 
 ## Usage
 
-The compat library may be found on jcenter repository. Add it to your project by adding the 
+The compat library may be found on Maven Central repository. Add it to your project by adding the 
 following dependency:
 
 ```Groovy
-implementation 'no.nordicsemi.android.support.v18:scanner:1.4.2'
+implementation 'no.nordicsemi.android.support.v18:scanner:1.4.4'
 ```
 
 Projects not migrated to Android Jetpack should use version 1.3.1, which is feature-equal to 1.4.0.
 
+As JCenter has shut down, starting from version 1.4.4 the library is available only on Maven Central. 
+Make sure you have `mavenCentral()` in your main *build.gradle* file:
+```gradle
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+}
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
+```
+
 ## API
 
 The Scanner Compat API is very similar to the original one, known from Android Oreo.
@@ -59,7 +74,7 @@ To start scanning use (example):
 	ScanSettings settings = new ScanSettings.Builder()
 				.setLegacy(false)
 				.setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
-				.setReportDelay(1000)
+				.setReportDelay(5000)
 				.setUseHardwareBatchingIfSupported(true)
 				.build();
 	List<ScanFilter> filters = new ArrayList<>();

build.gradle

@@ -1,22 +1,31 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    // https://plugins.gradle.org/plugin/io.github.gradle-nexus.publish-plugin
+    ext.gradle_nexus_publish_plugin = '1.1.0'
+
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
-
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath "io.github.gradle-nexus:publish-plugin:$gradle_nexus_publish_plugin"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
-}
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
+
+// Maven Central publishing
+apply plugin: 'io.github.gradle-nexus.publish-plugin'
+apply from: rootProject.file('gradle/publish-root.gradle')

gradle.properties

@@ -16,10 +16,9 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.enableJetifier=true
 android.useAndroidX=true
 
-VERSION_NAME=1.4.3
+VERSION_NAME=1.4.4
 GROUP=no.nordicsemi.android.support.v18
 
 POM_DESCRIPTION=Android Bluetooth LE Scanner Compat library
@@ -30,5 +29,6 @@ POM_SCM_DEV_CONNECTION=scm:[email protected]:NordicSemiconductor/Android-Scanner-Co
 POM_LICENCE=BSD 3-Clause
 POM_LICENCE_NAME=The BSD 3-Clause License
 POM_LICENCE_URL=http://opensource.org/licenses/BSD-3-Clause
-POM_DEVELOPER_ID=nordic
-POM_DEVELOPER_NAME=Nordic Semiconductor ASA
+POM_DEVELOPER_ID=philips77
+POM_DEVELOPER_NAME=Aleksander Nowakowski
+POM_DEVELOPER_EMAIL=[email protected]

gradle/gradle-bintray-push.gradle

@@ -0,0 +1,67 @@
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+group = GROUP
+version = VERSION_NAME
+
+task androidSourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from android.sourceSets.main.java.srcDirs
+    // from android.sourceSets.main.kotlin.srcDirs
+}
+
+artifacts {
+    archives androidSourcesJar
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+
+                artifact androidSourcesJar
+
+                groupId = GROUP
+                artifactId = POM_ARTIFACT_ID
+                version = VERSION_NAME
+
+                pom {
+                    name = POM_NAME
+                    packaging = POM_PACKAGING
+                    description = POM_DESCRIPTION
+                    url = POM_URL
+
+                    scm {
+                        url = POM_SCM_URL
+                        connection = POM_SCM_CONNECTION
+                        developerConnection = POM_SCM_DEV_CONNECTION
+                    }
+
+                    licenses {
+                        license {
+                            name = POM_LICENCE_NAME
+                            url = POM_LICENCE_URL
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id = POM_DEVELOPER_ID
+                            name = POM_DEVELOPER_NAME
+                            email = POM_DEVELOPER_EMAIL
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+ext["signing.keyId"] = rootProject.ext["signing.keyId"]
+ext["signing.password"] = rootProject.ext["signing.password"]
+ext["signing.secretKeyRingFile"] = rootProject.ext["signing.secretKeyRingFile"]
+
+signing {
+    sign publishing.publications
+}

gradle/publish-module.gradle

@@ -0,0 +1,22 @@
+// Create variables with empty default values
+File secretPropsFile = project.rootProject.file('local.properties')
+if (secretPropsFile.exists()) {
+    // Read local.properties file first if it exists
+    Properties p = new Properties()
+    new FileInputStream(secretPropsFile).withCloseable { is -> p.load(is) }
+    p.each { name, value -> ext[name] = value }
+}
+
+// Set up Sonatype repository
+
+nexusPublishing {
+
+    repositories {
+        sonatype {
+            stagingProfileId = sonatypeStagingProfileId
+            username = ossrhUsername
+            password = ossrhPassword
+        }
+    }
+
+}

gradle/publish-root.gradle

@@ -1,6 +1,6 @@
-#Fri Nov 15 09:17:12 CET 2019
+#Thu Jun 03 15:02:51 CEST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+zipStoreBase=GRADLE_USER_HOME