Skip to content

Commit 5590ed2

Browse files
authored
Revert "Release 4.3.0 isaacbrodsky (#171)" (#172)
This reverts commit 94550f5.
1 parent 94550f5 commit 5590ed2

File tree

5 files changed

+18
-262
lines changed

5 files changed

+18
-262
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 224 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,8 @@ file [H3Core.java](./src/main/java/com/uber/h3core/H3Core.java), and support
77
for the Linux x64 and Darwin x64 platforms.
88

99
## Unreleased Changes
10-
## Added
11-
- `polygonToCellsExperimental` functions from H3 v4.2.0. (#163)
12-
- `gridRing` function from H3 v4.3.0. (#169)
13-
14-
## Fixed
15-
- Corrected order of `polygonToCellsExperimental` arguments. (#166)
16-
- Fixed build on ARM Linux. (#162)
17-
18-
## Changed
19-
- Converted build system to Gradle and automated deploys. Added separate build steps for mac OS on M1 (ARM) and x64. (#167, #168)
20-
- Upgraded the core library to v4.2.1. (#165)
2110

2211
## [4.1.2] - 2024-11-01
23-
Note: This release is not available in Maven Central.
24-
2512
## Fixed
2613
- Fixed a memory leak in `polygonToCells` and optimize JNI calls. (#150)
2714
- Use `Files.createTempFile` so temporary file permissions are more restrictive. (#141)

build.gradle

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ plugins {
1818
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
1919
}
2020

21-
group = 'io.github.isaacbrodsky'
21+
group = 'com.uber'
22+
version = '4.1.3-SNAPSHOT'
2223
description = 'Java bindings for H3, a hierarchical hexagonal geospatial indexing system.'
2324

2425
java {
@@ -123,7 +124,7 @@ publishing {
123124
from components.java
124125
pom {
125126
name = 'h3'
126-
url = 'https://github.com/isaacbrodsky/h3-java'
127+
url = 'https://github.com/uber/h3-java'
127128
description = project.description
128129
licenses {
129130
license {
@@ -132,20 +133,22 @@ publishing {
132133
distribution = 'repo'
133134
}
134135
}
135-
// organization {
136-
// name = 'Uber Open Source'
137-
// url = 'https://github.com/uber/'
138-
// }
136+
organization {
137+
name = 'Uber Open Source'
138+
url = 'https://github.com/uber/'
139+
}
139140
scm {
140-
connection = 'scm:git:git://github.com/isaacbrodsky/h3-java.git'
141-
developerConnection = 'scm:git:ssh://[email protected]/isaacbrodsky/h3-java.git'
142-
url = 'http://github.com/isaacbrodsky/h3-java/tree/master'
141+
connection = 'scm:git:git://github.com/uber/h3-java.git'
142+
developerConnection = 'scm:git:ssh://[email protected]/uber/h3-java.git'
143+
url = 'http://github.com/uber/h3-java/tree/master'
143144
}
144145
developers {
145146
developer {
146147
id = 'isaacbrodsky'
147148
name = 'Isaac Brodsky'
148149
150+
organization = 'Uber Technologies, Inc.'
151+
organizationUrl = 'https://github.com/uber/'
149152
}
150153
}
151154
}
@@ -178,15 +181,12 @@ signing {
178181
nexusPublishing {
179182
repositories {
180183
sonatype {
181-
// Performance optimization, not needed:
182-
// stagingProfileId.set(System.getenv("OSSRH_STAGING_PROFILE_ID"))
184+
stagingProfileId.set(System.getenv("OSSRH_STAGING_PROFILE_ID"))
183185
username.set(System.getenv("OSSRH_USERNAME"))
184186
password.set(System.getenv("OSSRH_PASSWORD"))
185187
// For newer Sonatype accounts (after Feb 2021) use "s01.oss.sonatype.org":
186-
// nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
187-
// snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
188-
nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
189-
snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
188+
nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
189+
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
190190
}
191191
}
192192
}

docs/releasing.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
The H3-Java library is published to Maven Central via OSSRH.
44

5-
The release is triggered via GitHub Actions, when a tag of the form `v1.2.3` is pushed, or via workflow dispatch. The release workflow handles all parts of the release.
6-
7-
## Old instructions for manual releasing
8-
95
You must be a member of the `com.uber` group to release the library via OSSRH. You must have a [signing key](http://central.sonatype.org/pages/working-with-pgp-signatures.html) setup, and you must have your OSSRH username and password in the appropriate [Maven settings file](http://central.sonatype.org/pages/apache-maven.html).
106

117
Release builds pull artifacts from Github Actions. This is needed so that the deployed artifact contains all supported operating system/architecture combinations. (In particular, Mac OS artifacts must be built natively.) In order to release, there must be a completed build of the Git commit to release on Github. The build must be less than 30 days old, as artifacts are only kept for that time.
@@ -17,14 +13,14 @@ Release builds pull artifacts from Github Actions. This is needed so that the de
1713
5. If this looks good, close and release the build in [Sonatype Nexus Manager](https://oss.sonatype.org/).
1814
6. Update `CHANGELOG.md` to have an Unreleased section, and commit. The release is now done and development can resume from this point.
1915

20-
### Troubleshooting
16+
## Troubleshooting
2117

22-
#### Dependencies for `pull-from-github.sh`
18+
### Dependencies for `pull-from-github.sh`
2319

2420
* You should install the [Github CLI](https://cli.github.com) and authenticate with it first. You may need to use a personal access token (classic) with workflows scope.
2521
* `jq`
2622

27-
#### gpg: signing failed: Inappropriate ioctl for device
23+
### gpg: signing failed: Inappropriate ioctl for device
2824

2925
Per [StackOverflow](https://stackoverflow.com/questions/57591432/gpg-signing-failed-inappropriate-ioctl-for-device-on-macos-with-maven), run the following before `mvn release:perform`:
3026

gradle.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@
44
# Blocked on https://github.com/nbaztec/coveralls-jacoco-gradle-plugin/issues/66
55
org.gradle.configuration-cache=false
66

7-
# No spaces on the following line, needed by release.tml
8-
version=4.3.0
9-

0 commit comments

Comments
 (0)