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

Remove dependency on androidx.localbroadcastmanager. Re-enable Maven Central publishing #1022

Merged
merged 9 commits into from
Apr 14, 2021
Merged
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
16 changes: 0 additions & 16 deletions .travis.yml

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 @@
### 2.18 / 2021-04-14

- Remove dependency on androidx.localbroadcastmanager.content.LocalBroadcastManager (#1022, David G. Young)
- Redo build scripts and publishing setup for Maven Central due to JCenter sunset (#1022, David G. Young)
- Prevent internal growth of rangedRegions tracking set (#922, Oleksandr Vandalko)

### 2.17.1 / 2020-06-11

- Parse multiple manufacturer sections in the advertisement and the scan response to look for beacons. (#970, David G. Young)
Expand Down
6 changes: 4 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Android Beacon Library
Copyright 2014 Radius Networks
Copyright 2014-2021 Radius Networks
Copyright 2019-2021 Young Consulting

This product includes software developed at
The Radius Networks (http://www.radiusnetworks.com/).
Radius Networks (http://www.radiusnetworks.com/).
Young Consulting (http://davidgyoungtech.com).
37 changes: 15 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,21 @@ at a frequency of approximately 1Hz.

## Documentation

The [project website](http://altbeacon.github.io/android-beacon-library/) has [full documentation](http://altbeacon.github.io/android-beacon-library/documentation.html) including [Javadocs.](http://altbeacon.github.io/android-beacon-library/javadoc/)

## Changes from the 0.x library version

This library has changed significantly from the 0.x library version and is now designed to work with
open AltBeacons which fully support Android without any intellectual property restrictions. For
more information on how to migrate projects using the 0.x APIs to the 2.x APIs, see
[API migration.](api-migrate.md)
The [project website](http://altbeacon.github.io/android-beacon-library/) has [full documentation](http://altbeacon.github.io/android-beacon-library/documentation.html)

## Downloads

### Binary

You may [download binary releases here.](http://altbeacon.github.io/android-beacon-library/download.html)

### JCenter
### Maven

Add JCenter to your build file's list of repositories.

```groovy
repositories {
jcenter()
mavenCentral()
}
```

Expand All @@ -58,13 +51,13 @@ 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
3.4.1 and Gradle 5.1.1
4.1.3 and Gradle 6.5

Key Gradle build targets:

./gradlew test # run unit tests
./gradlew test # run unit tests. To see results: `open lib/build/reports/tests/testDebugUnitTest/index.html`
./gradlew build # development build
./gradlew release -Prelease # release build
./gradlew release # release build

## License

Expand All @@ -88,23 +81,23 @@ If you want to help with the open source project, contact david@radiusnetworks.c

The following instructions are for project administrators.

1. Upload you Sonotype signing keypair to Bintray
1. Prerequisites: https://getstream.io/blog/publishing-libraries-to-mavencentral-2021/

2. Configure your ~/.gradle/gradle.properties with:

signing.keyId=<my key id>
signing.password=<my passphrase>
signing.secretKeyRingFile=~/.gnupg/secring.gpg
signingPassword=<my passphrase>

bintrayUserName=<bintray username>
bintrayKey=<bintray api key>
signing.secretKeyRingFile=<path to exported gpg file>
signing.password=<my passphrase>
ossrhUsername=<sonotype server username>
ossrhPassword=<sonotype server password>

3. Run the build and upload

git tag <version>
git push --tags
./gradlew release -Prelease
./gradlew bintrayUpload -Prelease
./gradlew release
./gradlew mavenPublish
./gradlew closeAndReleaseRepository

4. Log in to JCenter, hit the button to publish the release, then select the Maven tab and enter your credentials to Sync to Maven
4. Keep checking for a half hour or so at https://repo1.maven.org/maven2/org/altbeacon/android-beacon-library/ to see that the new release shows up.
142 changes: 0 additions & 142 deletions api-migrate.md

This file was deleted.

57 changes: 42 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,31 +1,58 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
jcenter()
mavenCentral()
repositories {
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
}
jcenter()
}

dependencies {
classpath "com.android.tools.build:gradle:4.1.3"
classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.22.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

ext {
// setting release property breaks maven plugin
// so instead we indicate snapshots with -Psnapshot
isSnapshot = project.hasProperty('snapshot')
isSnapCi = System.getenv('SNAP_CI') != null
isSnapPullRequest = System.getenv('SNAP_PULL_REQUEST_NUMBER') != null
}

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"
/*
* Gets the version name from the latest Git tag
*/
def getVersionName = {
version = ""
def stdout = new ByteArrayOutputStream()
try {
exec {
commandLine 'git', 'describe', '--tags'
standardOutput = stdout
}
version = stdout.toString().trim()
}
catch (e) {
println("Can't get version from git: " + e);
version = "adhoc"
}
version = "${version}${isSnapshot ? "-SNAPSHOT" : ""}"
return version
}

allprojects {
repositories {
google()
jcenter()
}
version = getVersionName()
}

task clean(type: Delete) {
delete rootProject.buildDir
}

apply plugin: 'io.codearte.nexus-staging'

2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ machine:
version: openjdk8
dependencies:
pre:
- 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"
- echo y | android update sdk --no-ui --all --filter "tools,android-30,build-tools-30.0.3,platform-tools,extra-android-m2repository,extra-google-m2repository"
general:
branches:
ignore:
9 changes: 0 additions & 9 deletions eclipse-support/.classpath

This file was deleted.

33 changes: 0 additions & 33 deletions eclipse-support/.project

This file was deleted.

Loading