Skip to content

Commit 61ba880

Browse files
authored
Merge pull request #13 from dotSpaceTeam/dev_1.0.7
Version 1.0.7
2 parents 67f7c55 + 99b55b9 commit 61ba880

File tree

18 files changed

+393
-82
lines changed

18 files changed

+393
-82
lines changed

.github/workflows/gradle-test.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# This workflow will build a Java project with Gradle
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
3+
4+
name: CI Build and Test
5+
6+
on:
7+
push:
8+
branches-ignore: [ "main", "master" ]
9+
10+
jobs:
11+
build:
12+
13+
runs-on: self-hosted
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up JDK 17
18+
uses: actions/setup-java@v2
19+
with:
20+
java-version: '17'
21+
distribution: 'temurin'
22+
- name: Grant execute permission for gradlew
23+
run: chmod +x gradlew
24+
- name: Build with Gradle
25+
run: ./gradlew build test

.github/workflows/gradle.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ A library which is the core of our projects and can be used for other cool proje
2323
Include the library in your own project via [maven](https://maven.apache.org/) or [gradle](https://gradle.org/).
2424
Completed builds can be imported via our [repository](https://repo.dotspace.dev/repository/space-public/).
2525

26-
### Gradle:
26+
### Gradle:
2727
```
2828
//Repository
2929
maven {
@@ -32,7 +32,7 @@ maven {
3232
}
3333
3434
//Dependency
35-
implementation 'dev.dotspace:common:1.0.6'
35+
implementation 'dev.dotspace:common:1.0.7'
3636
```
3737
### Maven:
3838
```
@@ -47,7 +47,7 @@ implementation 'dev.dotspace:common:1.0.6'
4747
<dependency>
4848
<groupId>dev.dotspace</groupId>
4949
<artifactId>common</artifactId>
50-
<version>1.0.6</version>
50+
<version>1.0.7</version>
5151
</dependency>
5252
```
5353
---

build.gradle

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ plugins {
44
}
55

66
group 'dev.dotspace'
7-
version '1.0.6'
7+
version '1.0.7'
88

99
allprojects {
10+
ext {
11+
junitVersion = "5.9.0";
12+
}
13+
1014
apply plugin: 'java-library'
1115
apply plugin: 'io.freefair.lombok'
1216

@@ -21,11 +25,38 @@ allprojects {
2125
}
2226

2327
dependencies {
24-
api 'org.jetbrains:annotations:23.0.0'
25-
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
28+
api ("org.jetbrains:annotations:23.0.0")
29+
30+
testImplementation ("org.junit.jupiter:junit-jupiter:${junitVersion}")
31+
testRuntimeOnly ("org.junit.jupiter:junit-jupiter:${junitVersion}")
2632
}
2733

2834
test {
2935
useJUnitPlatform()
3036
}
31-
}
37+
}
38+
39+
/**
40+
* Update dependency version in README.md.
41+
*/
42+
tasks.register("updateDependencyInReadMe") {
43+
println("Updating dependency version in README.md...")
44+
// Update maven Version
45+
ant.replaceregexp(match: '<version>([0-9\\.]+)</version>',
46+
replace: "<version>${version}</version>",
47+
flags: 'g',
48+
byline: true) {
49+
fileset(dir: '.', includes: 'README.md')
50+
println("Updated mavem dependency verison.")
51+
}
52+
53+
// Update gradle version
54+
ant.replaceregexp(
55+
match: 'dev\\.dotspace\\:common\\:([0-9\\.]+)',
56+
replace: "dev.dotspace:common:${version}",
57+
flags: 'g',
58+
byline: true) {
59+
fileset(dir: '.', includes: 'README.md')
60+
println("Updated gradle dependency verison.")
61+
}
62+
}

core/build.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,11 @@ repositories {
66
mavenCentral()
77
}
88

9-
dependencies {
10-
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
9+
tasks.register('copyReport', Copy) {
10+
from layout.buildDirectory.file("reports/my-report.pdf")
11+
into layout.buildDirectory.dir("toArchive")
1112
}
1213

13-
java {
14-
withSourcesJar()
15-
}
16-
17-
1814
test {
1915
useJUnitPlatform()
2016
testLogging.showStandardStreams(true)

0 commit comments

Comments
 (0)