Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Hronom/poker-helper
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.1
Choose a base ref
...
head repository: Hronom/poker-helper
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 14 commits
  • 7 files changed
  • 2 contributors

Commits on Aug 2, 2015

  1. Add license to root pom file

    Hronom committed Aug 2, 2015
    Copy the full SHA
    f7e9ac2 View commit details

Commits on Aug 4, 2015

  1. Added Gitter badge

    gitter-badger committed Aug 4, 2015
    Copy the full SHA
    179b9db View commit details
  2. Merge pull request #1 from gitter-badger/gitter-badge-1

    Add a Gitter chat badge to README.md
    Hronom committed Aug 4, 2015
    Copy the full SHA
    712985b View commit details
  3. Update readme

    Hronom committed Aug 4, 2015
    Copy the full SHA
    0f2d811 View commit details
  4. Added Gitter integration

    Hronom committed Aug 4, 2015
    Copy the full SHA
    1e37c71 View commit details

Commits on Nov 7, 2015

  1. Copy the full SHA
    13fb23d View commit details
  2. Copy the full SHA
    6840b29 View commit details

Commits on Nov 14, 2015

  1. Try repair travis

    Hronom committed Nov 14, 2015
    Copy the full SHA
    49fa79f View commit details
  2. Try repair codecov

    Hronom committed Nov 14, 2015
    Copy the full SHA
    9251dee View commit details
  3. Try repair codecov 2

    Hronom committed Nov 14, 2015
    Copy the full SHA
    9d9417b View commit details

Commits on Sep 4, 2016

  1. Update dependencies

    Hronom committed Sep 4, 2016
    Copy the full SHA
    693fc7d View commit details

Commits on Oct 29, 2016

  1. Remove wercker

    Hronom committed Oct 29, 2016
    Copy the full SHA
    35c6d09 View commit details
  2. Update dependencies

    Hronom committed Oct 29, 2016
    Copy the full SHA
    91f7045 View commit details

Commits on Apr 15, 2017

  1. Update dependencies

    Hronom committed Apr 15, 2017
    Copy the full SHA
    9004d73 View commit details
19 changes: 14 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
language: java
jdk: oraclejdk7
jdk: oraclejdk8

before_install:
- sudo apt-get update -y
- sudo apt-get install -y python-software-properties build-essential
- sudo apt-get install -y libgd2-xpm ia32-libs ia32-libs-multiarch

after_success:
- bash <(curl -s https://codecov.io/bash)
- sudo pip install codecov

env:
global:
- APP_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.4.0:exec)

notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/19792f1aab7f7585c739
on_success: change # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: false # default: false

after_success:
- codecov

deploy:
provider: releases
@@ -20,4 +29,4 @@ deploy:
- "poker-helper-gui/dist/poker-helper-gui-$APP_VERSION-bin.zip"
skip_cleanup: true
on:
tags: true
tags: true
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![wercker status](https://app.wercker.com/status/c2fc5c26de5570726c511b68d445c6a1/s "wercker status")](https://app.wercker.com/project/bykey/c2fc5c26de5570726c511b68d445c6a1)
[![Build Status](https://travis-ci.org/Hronom/poker-helper.svg?branch=master)](https://travis-ci.org/Hronom/poker-helper)
[![codecov.io](http://codecov.io/github/Hronom/poker-helper/coverage.svg?branch=master)](http://codecov.io/github/Hronom/poker-helper?branch=master)
[![Dependency Status](https://www.versioneye.com/user/projects/55b3aa0c643533001a000552/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55b3aa0c643533001a000552)
[![Join the chat at https://gitter.im/Hronom/poker-helper](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Hronom/poker-helper?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

# Описание #
Простейшая реализация подсчётов из видео http://ru.pokerstrategy.com/video/29712/
@@ -11,4 +11,4 @@

Сила покерных рук – оцените вашу комбинацию http://ru.pokerstrategy.com/poker-hand-evaluations/

Starting Hand Chart (BSS) - http://resources.pokerstrategy.com/oldresources/ru/ps_bbs_chart_ru.pdf
Starting Hand Chart (BSS) - http://resources.pokerstrategy.com/oldresources/ru/ps_bbs_chart_ru.pdf
10 changes: 5 additions & 5 deletions poker-helper-core/pom.xml
Original file line number Diff line number Diff line change
@@ -17,12 +17,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.3</version>
<version>2.8.2</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.3</version>
<version>2.8.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -111,7 +111,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
<version>3.0.0</version>
<configuration>
<filesets>
<fileset>
@@ -129,15 +129,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<version>2.19</version>
<configuration>
<workingDirectory>${project.parent.basedir}/bin</workingDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.18.1</version>
<version>2.19</version>
<executions>
<execution>
<id>integration-tests</id>
16 changes: 8 additions & 8 deletions poker-helper-gui/pom.xml
Original file line number Diff line number Diff line change
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.3</version>
<version>2.8.2</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.3</version>
<version>2.8.2</version>
</dependency>
</dependencies>

@@ -76,7 +76,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.3</version>
<version>1.4</version>
<executions>
<execution>
<phase>validate</phase>
@@ -128,7 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
<version>3.0.0</version>
<configuration>
<filesets>
<fileset>
@@ -154,15 +154,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<version>2.19</version>
<configuration>
<workingDirectory>${project.parent.basedir}/bin</workingDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.18.1</version>
<version>2.19</version>
<executions>
<execution>
<id>integration-tests</id>
@@ -182,7 +182,7 @@
<plugin>
<groupId>com.akathist.maven.plugins.launch4j</groupId>
<artifactId>launch4j-maven-plugin</artifactId>
<version>1.7.7</version>
<version>1.7.8</version>
<executions>
<execution>
<id>l4j-clui</id>
@@ -223,7 +223,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.5</version>
<version>2.6</version>
<configuration>
<descriptors>
<descriptor>src/assembly/zip.xml</descriptor>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 31 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.github.hronom</groupId>
<artifactId>poker-helper</artifactId>
<version>1.0.1</version>
<packaging>pom</packaging>

<licenses>
<license>
<name>Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</name>
<url>http://creativecommons.org/licenses/by-nc-sa/4.0/</url>
</license>
</licenses>

<modules>
<module>poker-helper-core</module>
<module>poker-helper-gui</module>
@@ -35,6 +44,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<prerequisites>
<maven>3.3.1</maven>
</prerequisites>

<build>
<plugins>
<plugin>
@@ -71,7 +84,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
<version>3.0.0</version>
<configuration>
<filesets>
<fileset>
@@ -92,7 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<version>2.5.3</version>
</plugin>
<plugin>
<groupId>de.jutzig</groupId>
@@ -105,6 +118,21 @@
<artifact>${project.basedir}/dist/${project.artifactId}-${project.version}-bin.zip</artifact>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jdeps-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<version>1.2.1</version>
</plugin>
</plugins>
</build>
</project>
24 changes: 0 additions & 24 deletions wercker.yml

This file was deleted.