Skip to content
This repository was archived by the owner on Jan 13, 2021. It is now read-only.

Commit

Permalink
Merge pull request #39 from FelixGail/develop
Browse files Browse the repository at this point in the history
Release 0.3.5
  • Loading branch information
FelixGail authored Jul 28, 2018
2 parents 62ee45f + da8c1d2 commit 9402f8c
Show file tree
Hide file tree
Showing 93 changed files with 949 additions and 746 deletions.
4 changes: 4 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ jobs:
printf "auth.username=${auth_username}\n" >> gplaymusic.properties
printf "auth.password=${auth_password}\n" >> gplaymusic.properties
printf "auth.android_id=${auth_android_id}\n" >> gplaymusic.properties
printf "auth.free.username=${auth_free_username}\n" >> gplaymusic.properties
printf "auth.free.password=${auth_free_password}\n" >> gplaymusic.properties
printf "auth.free.android_id=${auth_free_android_id}\n" >> gplaymusic.properties
printf "auth.free.token=${auth_free_token}\n" >> gplaymusic.properties
printf "auth.token=${auth_token}\n" >> gplaymusic.properties
printf "test.track.playlist=${test_track_playlist}\n" >> gplaymusic.properties
fi
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ buildNumber.properties
gplaymusic.iml
src/test/resources/gplaymusic.properties
local_scripts/
gplaymusic.properties
46 changes: 46 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at felix.clemens.gail@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
27 changes: 27 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Contributing:

All contributions to this project are warmly welcome. If you are unsure whether your idea enhances the
project, you can discuss idea by creating an
[issue](https://github.com/FelixGail/gplaymusic/issues/new).

Please note that we have a
[code of conduct](https://github.com/FelixGail/gplaymusic/master/blob/CODE_OF_CONDUCT.md), please
follow it in all your interactions with the project.

## Contributing Code

1. Development should roughly follow the
[GitFlow](https://datasift.github.io/gitflow/IntroducingGitFlow.html) branching model
2. Increase the version numbers in any examples files and the pom.xml to the new
version that this Pull Request would represent.
The versioning scheme we use is [SemVer](http://semver.org/).
3. Please make sure your Pull request passes the existing tests.
4. Follow the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html).<br>
_(The [styleguide](https://github.com/google/styleguide) repository contains xml files to import the
code style profile into IntelliJ and Eclipse)_
5. If you want to occur in the list of contributors, please add your information in the contributors
section of the _pom.xml_.

### Attribution
This contributing guide is based on a template by
[PurpleBooth](https://gist.github.com/PurpleBooth/b24679402957c63ec426).
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Unofficial GPlayMusic API in JAVA
[![CircleCI](https://img.shields.io/circleci/project/github/FelixGail/gplaymusic/master.svg)](https://circleci.com/gh/FelixGail/gplaymusic/tree/master)
[![CircleCI](https://img.shields.io/circleci/project/github/FelixGail/gplaymusic/master.svg?label=master)](https://circleci.com/gh/FelixGail/gplaymusic/tree/master)
[![CircleCI](https://img.shields.io/circleci/project/github/FelixGail/gplaymusic/develop.svg?label=develop)](https://circleci.com/gh/FelixGail/gplaymusic/tree/develop)
<br>
[![GitHub release](https://img.shields.io/github/release/FelixGail/gplaymusic.svg)](https://github.com/FelixGail/gplaymusic/releases)

This library poses as a client for the [GooglePlay](https://play.google.com/music/) app.
Expand All @@ -22,7 +24,7 @@ To use this library, simply add the following lines to your pom.xml:<br><br>
<dependency>
<groupId>com.github.felixgail</groupId>
<artifactId>gplaymusic</artifactId>
<version>0.3.0</version>
<version>0.3.5</version>
</dependency>
```

Expand Down Expand Up @@ -59,3 +61,7 @@ For now use the Javadoc to help yourself. It can be found

Feel free to create an [issue](https://github.com/FelixGail/gplaymusic/issues) if you have
questions or problems.

Attribution
-----------
Special thanks to [gmusicapi project by Simon Webers](https://github.com/simon-weber/gmusicapi). I started this project as a port for this great library.
Loading

0 comments on commit 9402f8c

Please # to comment.