Commit Graph

267 Commits

Author SHA1 Message Date
Bas Couwenberg 5bb6bbfc62 Set Java version to 1.8 to match Maven build. 2026-03-10 19:38:12 +01:00
Leonard Ehrenfried bc457ce7c0
Bump version to 1.6.1 2025-12-20 10:45:14 +01:00
Leonard Ehrenfried 7c3f68f622
Merge pull request #92 from openstreetmap/upgrade-protobuf
Upgrade Java's protobuf to 4.33.2
2025-12-20 10:31:55 +01:00
Leonard Ehrenfried ca046bcff4
Add badges for Java 2025-12-20 09:51:03 +01:00
Leonard Ehrenfried 4048bf6e35
Add changelog 2025-12-20 09:46:06 +01:00
Leonard Ehrenfried de424ed053
Upgrade protobuf to 4.33.2 2025-12-20 09:35:29 +01:00
Jochen Topf 0cc6f10fcf CI: Fix macOS build 2025-12-03 09:20:32 +01:00
Jochen Topf 32c3e92166 Update CI to run on Ubuntu 22.04 and 24.04 2025-06-11 11:07:09 +02:00
Jochen Topf a2e364e5e7
Merge pull request #87 from leonardehrenfried/master
Release version 1.6.0 of Java
2024-12-10 09:55:59 +01:00
Leonard Ehrenfried 92a9c8d572
Don't wait for publishing 2024-12-10 08:48:05 +01:00
Leonard Ehrenfried 68d2b397a1
Configure auto-publish 2024-12-10 08:20:51 +01:00
Leonard Ehrenfried c5044e0f0a
Release version 1.6.0 2024-12-10 08:20:09 +01:00
Jochen Topf a8c4dd1c11
Merge pull request #84 from leonardehrenfried/master
Update to latest version of protobuf compiler and Java runtime
2024-11-13 11:09:54 +01:00
Leonard Ehrenfried 505052800e
Use single variable for compiler and runtime 2024-11-07 22:09:23 +01:00
Leonard Ehrenfried f427d7458e
Update to latest version of protobuf compiler and Java runtime 2024-11-07 22:06:32 +01:00
Jochen Topf 7050448620
Merge pull request #83 from codesoap/master
Remove trailing newlines from proto files
2024-09-29 10:15:27 +02:00
codesoap ecf26bf6a3 Remove trailing newlines from proto files 2024-09-29 07:35:19 +02:00
Jochen Topf 65e7e976f5
Merge pull request #79 from simon04/patch-5
actions/setup-java@v4
2024-03-28 10:56:52 +01:00
Simon Legner fa266b6f9b actions/setup-java@v4 2024-03-27 22:13:01 +01:00
Jochen Topf db10ff0949 Modernize github actions 2024-03-11 09:26:22 +01:00
Jochen Topf 802d4603b2 Remove Makefiles (have been deprecated a while) 2024-03-11 09:19:08 +01:00
Jochen Topf 30097cd4cb CMake config: Set minimum C++ version needed in a different way
This setting should be overwritten if CMake find that some library needs
an even more modern version.
2024-01-07 17:41:31 +01:00
Jochen Topf 4e009b0055
Merge pull request #77 from simonpoole/expose_CompressFlags
Extract and make CompressFlags public
2024-01-07 14:03:33 +01:00
simonpoole 8219186b2e Extract and make CompressFlags public
Fixes https://github.com/openstreetmap/OSM-binary/issues/68
2024-01-07 11:44:09 +01:00
Jochen Topf 374895c1e3 Set C++11 as minimum supported C++ version
Fixes #71
2023-10-02 10:04:01 +02:00
Jochen Topf 3b3b9cd2cd
Merge pull request #70 from openstreetmap/dependabot/maven/com.google.protobuf-protobuf-java-3.16.3
Bump protobuf-java from 3.16.1 to 3.16.3
2023-10-02 09:42:27 +02:00
Jochen Topf 7259487654 Github action: Use checkout v4 2023-10-02 09:37:52 +02:00
Jochen Topf 85e763ea0f Github action: Use clang 15 on Ubuntu 22.04 2023-10-02 09:37:52 +02:00
Jochen Topf ffd833fb22
Merge pull request #73 from probonopd/patch-1
#include <unistd.h>
2023-10-02 09:37:29 +02:00
probonopd 6483ae0dcb
#include <unistd.h>
Fixes compilation on FreeBSD
Closes #72
2023-10-01 23:58:09 +02:00
dependabot[bot] 587cbd2776
Bump protobuf-java from 3.16.1 to 3.16.3
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.16.1 to 3.16.3.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.16.1...v3.16.3)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-04 23:48:44 +00:00
Jochen Topf 37adab91e5 Remove symlink from osmpbf to src, use osmpbf directly 2022-05-27 12:36:32 +02:00
Jochen Topf 4195fe6557 CMake config: Remove unused line 2022-05-27 12:35:46 +02:00
Jochen Topf 6e9c00769f CMake: Do not set C++ version any more.
At least C++11 is standard in modern compilers anyway. Only macOS seems
to need an explicit set for this.
2022-05-27 11:48:42 +02:00
Jochen Topf cffbe661b1 Github Actions: Build on Ubuntu 20.04/22.04, not 18.04 any more 2022-05-27 11:06:51 +02:00
Jochen Topf a3f9e58622 Show packaging status in README.md 2022-01-08 10:07:10 +01:00
Jochen Topf 278c07098f Guthub action: Remove Ubuntu 16 from CI build
Because thas system isn't supported any more by github.
2022-01-08 10:06:00 +01:00
Jochen Topf edad45f7ab
Merge pull request #67 from openstreetmap/dependabot/maven/com.google.protobuf-protobuf-java-3.16.1
Bump protobuf-java from 3.13.0 to 3.16.1
2022-01-08 10:04:02 +01:00
dependabot[bot] 6d91b131e1
Bump protobuf-java from 3.13.0 to 3.16.1
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.13.0 to 3.16.1.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/master/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.13.0...v3.16.1)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-07 22:36:35 +00:00
Jochen Topf 7e111e6791
Merge pull request #66 from openstreetmap/ant-build
Ant build
2021-01-09 21:49:01 +01:00
Jochen Topf 0e99a6fef2 Document build with Ant 2021-01-09 10:14:23 +01:00
Jochen Topf d9ee34140d Revert "Delete obsolete build.sh"
This reverts commit 33e940238b.

Ant build is still used by Debian
2021-01-09 09:54:12 +01:00
Jochen Topf 40d041e344 Revert "Delete obsolete Ant build file"
This reverts commit fa86a8a640.

Ant build is still used by Debian
2021-01-09 09:47:02 +01:00
Jochen Topf 5b8c95fb1d Release version 1.5.0 2021-01-06 14:47:22 +01:00
Jochen Topf 6d42449842
Merge pull request #65 from simon04/oneof
fileformat.proto: use oneof for blob data
2021-01-05 10:24:41 +01:00
Jochen Topf 22b9f74702
Merge pull request #63 from simon04/java-refact
BlockReaderAdapter: implement Closeable, Flushable
2021-01-05 10:10:34 +01:00
Simon Legner a1e4a59995 fileformat.proto: use oneof for blob data
Ref: https://developers.google.com/protocol-buffers/docs/proto#oneof
2021-01-04 23:51:08 +01:00
Simon Legner 3dac689ea7 BlockReaderAdapter: implement Closeable, Flushable 2021-01-04 20:34:57 +01:00
Jochen Topf 1c7fadcde8
Merge pull request #61 from simon04/patch-4
README: fix Java usage example link
2021-01-04 13:42:24 +01:00
Jochen Topf cba41e6ce1
Merge pull request #62 from simon04/license
Fix license files
2021-01-04 13:41:58 +01:00