Skip to content

Commit 8a30cc5

Browse files
authored
Version 1.3.0
Merge pull request #7 from Samasaur1/development
2 parents d0751fc + 87bf48d commit 8a30cc5

File tree

2 files changed

+47
-15
lines changed

2 files changed

+47
-15
lines changed

.travis.yml

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@ sudo: false
22

33
language: "java"
44

5-
jdk: "oraclejdk8"
5+
jdk:
6+
- oraclejdk8
7+
- oraclejdk9
8+
- oraclejdk10
9+
- openjdk8
10+
- openjdk9
611

7-
script: "./gradlew build"
12+
13+
script: "./gradlew clean build --rerun-tasks --scan"
814

915
before_deploy:
1016
- ./gradlew clean
@@ -15,11 +21,25 @@ before_deploy:
1521
- git tag $NAME
1622

1723
deploy:
18-
provider: releases
19-
api_key: "$GH_TOKEN"
20-
file_glob: true
21-
file: "build/libs/*"
22-
skip_cleanup: true
23-
name: $NAME
24-
on:
25-
branch: master
24+
- provider: script
25+
script:
26+
- git clone git://github.com/Samasaur1/Maven-Central.git
27+
- cd Maven-Central
28+
- git config user.name "Sam Gauck"
29+
- git config user.email "30577766+Samasaur1@users.noreply.github.com"
30+
- mvn install:install-file -Dcom.gauck.sam -DartifactId=Utilities -Dversion=$(./gradlew version -q) -Dfile=../build/libs/Utilities-$(./gradlew version -q).jar -Dpackaging=jar -DgeneratePom=true -DlocalRepositoryPath=. -DcreateChecksum=true
31+
- git add com/gauck/sam/Utilities/*
32+
- git commit -m "Add Utilities version $(./gradlew version -q)"
33+
- git push "https://$GH_TOKEN@github.com/Samasaur1/Maven-Central.git master > /dev/null 2>&1
34+
on:
35+
tags: true
36+
jdk: oraclejdk8
37+
- provider: releases
38+
api_key: "$GH_TOKEN"
39+
file_glob: true
40+
file: "build/libs/*"
41+
skip_cleanup: true
42+
name: $NAME
43+
on:
44+
branch: master
45+
jdk: oraclejdk8

build.gradle

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ import java.util.regex.Pattern
22

33
plugins {
44
id 'java'
5+
id 'com.gradle.build-scan' version '1.15.2'
56
}
67

78
group 'com.gauck.sam'
8-
version '1.2.0'
9+
version '1.3.0'
910

1011
sourceCompatibility = 1.8
1112

@@ -17,6 +18,11 @@ dependencies {
1718
testCompile group: 'junit', name: 'junit', version: '4.12'
1819
}
1920

21+
buildScan {
22+
termsOfServiceUrl = 'https://gradle.com/terms-of-service'
23+
termsOfServiceAgree = 'yes'
24+
}
25+
2026
def incrementPatchVersion() {
2127
println(":incrementVersion - Incrementing Patch Version...")
2228
incrementVersion(false, false, true)
@@ -44,7 +50,7 @@ def incrementVersion(boolean major, boolean minor, boolean patch) {
4450
println()
4551

4652
def file = file("build.gradle")
47-
def patternVersionNumber = Pattern.compile("version '(\\d+)\\.(\\d+)\\.(\\d+)'")
53+
def patternVersionNumber = Pattern.compile("(?<=\\n)version '(\\d+)\\.(\\d+)\\.(\\d+)'")
4854
def text = file.getText()
4955
def matcherVersionNumber = patternVersionNumber.matcher(text)
5056
matcherVersionNumber.find()
@@ -67,7 +73,7 @@ def setVersion(int major, int minor, int patch) {
6773
print(":setVersion - Setting version to ")
6874

6975
def file = file("build.gradle")
70-
def patternVersionNumber = Pattern.compile("version '(\\d+)\\.(\\d+)\\.(\\d+)'")
76+
def patternVersionNumber = Pattern.compile("(?<=\\n)version '(\\d+)\\.(\\d+)\\.(\\d+)'")
7177
def text = file.getText()
7278
def matcherVersionNumber = patternVersionNumber.matcher(text)
7379
matcherVersionNumber.find()
@@ -91,7 +97,7 @@ def setVersion(String version, boolean dummy) {
9197
println()
9298

9399
def file1 = file("build.gradle")
94-
def patternVersionNumber1 = Pattern.compile("version '(\\d+)\\.(\\d+)\\.(\\d+)'")
100+
def patternVersionNumber1 = Pattern.compile("(?<=\\n)version '(\\d+)\\.(\\d+)\\.(\\d+)'")
95101
def text1 = file1.getText()
96102
def matcherVersionNumber1 = patternVersionNumber1.matcher(text1)
97103
matcherVersionNumber1.find()
@@ -178,4 +184,10 @@ task resetVersion(dependsOn: ':version') {
178184
println("It should be: \${MAJOR}.\${MINOR}.\${PATCH}-\${BRANCHNAME}-b\${BUILDNUMBER}")
179185
setVersion(System.in.newReader().readLine(), true)
180186
}
181-
}
187+
}
188+
189+
test {
190+
testLogging {
191+
events "passed", "skipped", "failed"
192+
}
193+
}

0 commit comments

Comments
 (0)