Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .idea/runConfigurations/Interop_Tests.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions .idea/runConfigurations/Unit_Tests.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ notifications:
on_success: never
on_failure: change
before_script: mvn --version
script: mvn -B clean verify -P code-coverage
script: mvn -B clean verify -P node,code-coverage
after_success:
- bash <(curl -s https://codecov.io/bash)
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ test:
- mkdir -p $CIRCLE_TEST_REPORTS/junit/
- find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
override:
- mvn clean verify -P code-coverage
- mvn -B clean verify -P node,code-coverage
- find . -type f -regextype posix-egrep -regex ".*/target/(.*asc|.*jar|.*md5|.*pom|.*sha1)" -exec cp {} $CIRCLE_ARTIFACTS \;
2 changes: 2 additions & 0 deletions icecore-hashids.iml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-junit:2.0.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:java-hamcrest:2.0.0.0" level="project" />
</component>
</module>
14 changes: 14 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "icecore-hashids",
"version": "0.3.0",
"private": true,
"description": "A lightweight generator for short, unique, non-sequential and decodable Hashids from positive unsigned (long) integer numbers.",
"author": {
"name": "Arctic Ice Studio",
"url": "http://arcticicestudio.com"
},
"license": "Apache 2.0",
"dependencies": {},
"devDependencies": {
"hashids": "1.1.1"
},
"scripts": {}
}
70 changes: 59 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.version.min>3.0.4</maven.version.min>

<checkstyle.version>8.0</checkstyle.version>
<junit.version>4.12</junit.version>
<hamcrest.version>1.3</hamcrest.version>
<hamcrest.version>2.0.0.0</hamcrest.version>
<node.version>v8.2.1</node.version>
</properties>

<scm>
Expand All @@ -99,7 +99,7 @@

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<artifactId>hamcrest-junit</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -286,6 +286,54 @@
</pluginRepositories>

<profiles>
<profile>
<id>node</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>node_modules</directory>
</fileset>
</filesets>
</configuration>
</plugin>

<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>install-node-and-npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>${node.version}</nodeVersion>
<installDirectory>${project.build.directory}</installDirectory>
</configuration>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<installDirectory>${project.build.directory}</installDirectory>
<arguments>install</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>code-coverage</id>
<build>
Expand Down Expand Up @@ -317,15 +365,15 @@
<id>jfrog</id>
<distributionManagement>
<downloadUrl>https://github.com/arcticicestudio/icecore-hashids</downloadUrl>
<snapshotRepository>
<id>bintray</id>
<name>OSS JFrog</name>
<url>http://oss.jfrog.org/artifactory/oss-snapshot-local</url>
</snapshotRepository>
<snapshotRepository>
<id>bintray</id>
<name>OSS JFrog</name>
<url>http://oss.jfrog.org/artifactory/oss-snapshot-local</url>
</snapshotRepository>
<repository>
<id>bintray</id>
<name>JFrog Bintray</name>
<url>https://api.bintray.com/maven/arcticicestudio/IceCore/icecore-hashids/;publish=1</url>
<id>bintray</id>
<name>JFrog Bintray</name>
<url>https://api.bintray.com/maven/arcticicestudio/IceCore/icecore-hashids/;publish=1</url>
</repository>
</distributionManagement>
</profile>
Expand Down
90 changes: 0 additions & 90 deletions src/main/java/com/arcticicestudio/icecore/hashids/Hashid.java

This file was deleted.

Loading