diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 949f0d9..ff9cf9f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -223,3 +223,4 @@ jobs: # git config user.email "[email protected]" # git commit -am "chore: start next development cycle $NEXT_VERSION [skip ci]" # git push origin HEAD:master + diff --git a/README.md b/README.md index 13b77a3..d1d8bde 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ # H3-Java -[![tests](https://github.com/uber/h3-java/workflows/tests/badge.svg)](https://github.com/uber/h3-java/actions) -[![Coverage Status](https://coveralls.io/repos/github/uber/h3-java/badge.svg?branch=master)](https://coveralls.io/github/uber/h3-java?branch=master) +[![tests](https://github.com/isaacbrodsky/h3-java/workflows/tests/badge.svg)](https://github.com/isaacbrodsky/h3-java/actions) +[![Coverage Status](https://coveralls.io/repos/github/isaacbrodsky/h3-java/badge.svg?branch=master)](https://coveralls.io/github/isaacbrodsky/h3-java?branch=master) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.uber/h3/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.uber/h3) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.isaacbrodsky/h3/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.isaacbrodsky/h3) [![H3 Version](https://img.shields.io/badge/h3-v4.3.0-blue.svg)](https://github.com/uber/h3/releases/tag/v4.3.0) -This library provides Java bindings for the [H3 Core Library](https://github.com/uber/h3). For API reference, please see the [H3 Documentation](https://h3geo.org/). +This library provides Java bindings for the [H3 Core Library](https://github.com/uber/h3). For API reference, please see the [H3 Documentation](https://h3geo.org/). It provides the same API as [uber/h3-java](https://github.com/uber/h3-java) from which it is based. # Usage @@ -16,7 +16,7 @@ Add it to your pom.xml: ```xml - com.uber + io.github.isaacbrodsky h3 4.3.2 @@ -25,7 +25,7 @@ Add it to your pom.xml: Or, using Gradle: ```gradle -compile("com.uber:h3:4.3.2") +compile("io.github.isaacbrodsky:h3:4.3.2") ``` Encode a location into a hexagon address: @@ -109,5 +109,7 @@ Before we can merge your changes, you must agree to the [Uber Contributor Licens H3-Java is licensed under the [Apache 2.0 License](./LICENSE). +H3-Java Copyright 2017 Uber Technologies, Inc. + DGGRID Copyright (c) 2015 Southern Oregon University diff --git a/build.gradle b/build.gradle index 4322b34..44149b4 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { } -group = 'com.uber' +group = 'io.github.isaacbrodsky' description = 'Java bindings for H3, a hierarchical hexagonal geospatial indexing system.' java { @@ -73,6 +73,7 @@ compileJava { // Task to build H3 native code task buildH3(type: Exec) { workingDir "${projectDir}" + dependsOn compileJava if (System.getProperty('os.name').toLowerCase().contains('windows')) { commandLine 'powershell', '-ExecutionPolicy', 'Bypass', '-File', './src/main/c/h3-java/build-h3-windows.ps1', h3GitRemote, h3GitReference @@ -81,21 +82,22 @@ task buildH3(type: Exec) { h3SystemPrune, h3DockcrossTag, h3DockcrossOnly, h3GithubArtifactsUse, h3GithubArtifactsByRun } - dependsOn compileJava outputs.dir("${projectDir}/src/main/resources") } // Task to build H3 native code for Android only task buildH3Android(type: Exec) { + mustRunAfter buildH3 + dependsOn compileJava workingDir "${projectDir}" commandLine './src/main/c/h3-java/build-h3.sh', h3GitRemote, h3GitReference, 'true', h3SystemPrune, h3DockcrossTag, 'android-arm android-arm64', h3GithubArtifactsUse, h3GithubArtifactsByRun - dependsOn compileJava outputs.dir("${projectDir}/src/main/resources") } processResources { + mustRunAfter buildH3Android dependsOn buildH3 } @@ -123,6 +125,7 @@ jacocoTestReport { jar { dependsOn buildH3 + mustRunAfter buildH3Android from sourceSets.main.resources duplicatesStrategy = DuplicatesStrategy.EXCLUDE } @@ -143,7 +146,7 @@ task compileAndroidJava(type: JavaCompile) { // Android JAR task - creates JAR with only Android native libraries task androidJar(type: Jar) { - dependsOn compileAndroidJava + dependsOn compileAndroidJava, buildH3Android archiveBaseName = 'h3-android' archiveVersion = project.version @@ -253,12 +256,15 @@ mavenPublishing { sourcesJar { dependsOn buildH3 + mustRunAfter buildH3Android } // Android sources JAR task androidSourcesJar(type: Jar) { + dependsOn buildH3Android + archiveBaseName = 'h3-android' archiveVersion = project.version archiveClassifier = 'sources' @@ -281,9 +287,9 @@ publishing { // Generate POM for Android pom { name = 'h3' + url = 'https://github.com/isaacbrodsky/h3-java' description = 'H3 library with Android support - hierarchical hexagonal geospatial indexing system.' - url = 'https://github.com/uber/h3-java' - + licenses { license { name = 'The Apache License, Version 2.0' @@ -291,12 +297,16 @@ publishing { distribution = 'http://www.apache.org/licenses/LICENSE-2.0.txt' } } - - organization { - name = 'Uber Open Source' - url = 'https://github.com/uber/' + // organization { + // name = 'Uber Open Source' + // url = 'https://github.com/uber/' + // } + scm { + connection = 'scm:git:git://github.com/isaacbrodsky/h3-java.git' + developerConnection = 'scm:git:ssh://git@github.com/isaacbrodsky/h3-java.git' + url = 'http://github.com/isaacbrodsky/h3-java/tree/master' } - + developers { developer { id = 'isaacbrodsky'