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.

Sign up for GitHub

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

Jump to bottom

chore: bump version #80

Merged
merged 11 commits into from
Feb 17, 2019
Merged

chore: bump version #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d12af6f
misc: add arduino sketch path to config
sleepdefic1t Feb 5, 2019
7e952a5
Revert "misc: add arduino sketch path to config"
sleepdefic1t Feb 5, 2019
cf22cd5
Merge remote-tracking branch 'upstream/master'
sleepdefic1t Feb 8, 2019
7173739
Merge remote-tracking branch 'upstream/master'
sleepdefic1t Feb 9, 2019
953ee5d
Merge remote-tracking branch 'upstream/master'
sleepdefic1t Feb 11, 2019
5628be8
Merge remote-tracking branch 'upstream/master'
sleepdefic1t Feb 14, 2019
167edd7
Merge remote-tracking branch 'upstream/master'
sleepdefic1t Feb 15, 2019
cf6368b
chore: bump version
sleepdefic1t Feb 15, 2019
9fddb98
fix: add helper file
sleepdefic1t Feb 16, 2019
13aed2e
fix: export './docs' and './extras' folder
sleepdefic1t Feb 17, 2019
de93fe9
Merge branch 'master' into chore/bump-version
faustbrian Feb 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## Unreleased

## [1.2.0] - 2019-02-16
## [1.2.0-arduino] - 2019-02-16
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we really required to do duplicate tags for the same code? Shouldn't everything work with a single tag now that the arduino config is setup?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, and no.

Arduino branch will have a different folder structure compatible with Arduino’s library manager.

The Arduino tags should target the Arduino branch; regular tag should target master.

what’s basically going on:
master | 1.2.0
master >> Arduino Script >> arduino branch | 1.2.0-arduino

Using two releases is per @kristjank and discussion here:
https://forum.arduino.cc/index.php?topic=596617.0

The Library Manager indexer job just works off of Git tags. As long as the tag points to something that is compliant, it's fine. You could have one branch of the repo with the Library Manager compatible structure that you point the Library Manager tags at, and another branch of the repository with your existing structure. You should also be able to create tags that point to the non-compliant branch and the Library Manager indexer should just ignore those.

The alternative would be a completely separate Arduino repo with nearly identical code, just laid out differently than PlatformIO and Desktop builds.

I’m open to more discussion if you feel it’s warranted though.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense now, thanks for the link.


### Added
- Arduino CircleCI config

### Changed
- updated `keywords.txt`.
- updated `./library.json` package export settings.
- removed unnecessary files:
- `./appveyor.yml`.
- `./CMakeSettings.json`.
- submodule from `cmake_example`.
- removed `./src/stl` library.
- moved `./docs` to `./extras` in arduino builds.
- automated `ARDUINO_IDE.sh` script.
- updated `ARDUINO_IDE.sh` script to reflect `lib/` changes.

## [1.1.0] - 2019-02-07

### Added
Expand Down
4 changes: 3 additions & 1 deletion library.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "git",
"url": "https://github.com/ArkEcosystem/Cpp-Client.git"
},
"version": "1.1.0",
"version": "1.2.0",
"authors": [
{
"name": "Ark Ecosystem",
Expand All @@ -21,6 +21,8 @@
"include": [
"src/*",
"examples/*",
"docs/*",
"extras/*",
"*.md",
"*.json",
"*.properties",
Expand Down
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Ark-Cpp-Client
version=1.1.0
version=1.2.0
author=Ark Ecosystem
maintainer=Ark Ecosystem
sentence=A simple API client implementation in C++ for the ARK Blockchain.
Expand Down
1 change: 1 addition & 0 deletions src/include/cpp-client/arkClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#ifndef ARKCLIENT_H
#define ARKCLIENT_H

#include "helpers/client_helpers.h"
#include "connection/connection.h"

#endif