Skip to content
This repository has been archived by the owner on Jul 28, 2021. It is now read-only.

Commit

Permalink
Merge pull request #110 from IncPlusPlus/develop
Browse files Browse the repository at this point in the history
Finally pass license check
  • Loading branch information
IncPlusPlus authored Sep 20, 2019
2 parents d4ad004 + e5d75fd commit 7a6a384
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 16 deletions.
4 changes: 2 additions & 2 deletions (broken)bintray_info_gradle.JSON
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
},

"version": {
"name": "1.0.51"
"name": "1.0.52"
},

"files":
[
{"includePattern": "bigtoolbox\/build\/libs\/((\\w+)-(\\d+).(\\d+).(\\d+).jar)", "excludePattern": ".*/do-not-deploy/.*", "uploadPattern": "$3.$4.$5/$2-$3.$4.$5.jar"},
{"includePattern": "bigtoolbox\/build\/libs\/((\\w+)-(\\d+).(\\d+).(\\d+)(-(\\w+)){1}.jar)", "excludePattern": ".*/do-not-deploy/.*", "uploadPattern": "$3.$4.$5/$2-$3.$4.$5$6.jar"},
{"includePattern": "bigtoolbox\/pom.xml", "excludePattern": ".*/do-not-deploy/.*", "uploadPattern": "1.0.51/pom.xml"}
{"includePattern": "bigtoolbox\/pom.xml", "excludePattern": ".*/do-not-deploy/.*", "uploadPattern": "1.0.52/pom.xml"}
],
"publish": true
}
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ matrix:
file_glob: true
file: target/bigtoolbox-*.*.*.jar
skip_cleanup: true
draft: true
on:
repo: IncPlusPlus/bigtoolbox
branch: master
Expand Down
4 changes: 2 additions & 2 deletions assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<parent>
<groupId>io.github.incplusplus</groupId>
<artifactId>bigtoolbox</artifactId>
<version>1.0.51</version>
<version>1.0.52</version>
</parent>
<version>1.0.51</version>
<version>1.0.52</version>
<artifactId>assembly</artifactId>
<packaging>pom</packaging>
<name>Big Tool Box Assembler</name>
Expand Down
2 changes: 1 addition & 1 deletion bintray_info_maven.JSON
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},

"version": {
"name": "1.0.51"
"name": "1.0.52"
},

"files":
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

allprojects {
group = 'io.github.incplusplus'
version = '1.0.51'
version = '1.0.52'
}

subprojects {
Expand Down
4 changes: 2 additions & 2 deletions io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>io.github.incplusplus</groupId>
<artifactId>bigtoolbox</artifactId>
<version>1.0.51</version>
<version>1.0.52</version>
</parent>
<artifactId>io</artifactId>
<name>Big Tool Box: IO</name>
<packaging>jar</packaging>
<version>1.0.51</version>
<version>1.0.52</version>

<build>
<finalName>io</finalName>
Expand Down
4 changes: 2 additions & 2 deletions math/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>io.github.incplusplus</groupId>
<artifactId>bigtoolbox</artifactId>
<version>1.0.51</version>
<version>1.0.52</version>
</parent>
<artifactId>math</artifactId>
<name>Big Tool Box: Math</name>
<version>1.0.51</version>
<version>1.0.52</version>
<packaging>jar</packaging>

<build>
Expand Down
24 changes: 21 additions & 3 deletions network/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,31 @@
<parent>
<groupId>io.github.incplusplus</groupId>
<artifactId>bigtoolbox</artifactId>
<version>1.0.51</version>
<version>1.0.52</version>
</parent>
<artifactId>network</artifactId>
<name>Big Tool Box: Network</name>
<packaging>jar</packaging>
<version>1.0.51</version>
<version>1.0.52</version>

<repositories>
<repository>
<snapshots>
<enabled>
false
</enabled>
</snapshots>
<id>
bintray-incplusplus-main-maven
</id>
<name>
bintray
</name>
<url>
https://dl.bintray.com/incplusplus/main-maven
</url>
</repository>
</repositories>

<build>
<resources>
Expand Down Expand Up @@ -114,7 +132,7 @@
<dependency>
<groupId>io.github.incplusplus</groupId>
<artifactId>bigtoolbox</artifactId>
<version>1.0.50</version>
<version>1.0.51</version>
</dependency>
</dependencies>
<properties>
Expand Down
4 changes: 2 additions & 2 deletions os/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>io.github.incplusplus</groupId>
<artifactId>bigtoolbox</artifactId>
<version>1.0.51</version>
<version>1.0.52</version>
</parent>
<artifactId>os</artifactId>
<name>Big Tool Box: OS</name>
<packaging>jar</packaging>
<version>1.0.51</version>
<version>1.0.52</version>

<build>
<finalName>os</finalName>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.incplusplus</groupId>
<artifactId>bigtoolbox</artifactId>
<version>1.0.51</version>
<version>1.0.52</version>
<packaging>pom</packaging>
<name>Big Tool Box</name>
<description>A collection of tools for varying purposes.</description>
Expand Down

0 comments on commit 7a6a384

Please sign in to comment.