Skip to content

Commit cc90741

Browse files
authored
Merge pull request #3 from hexlet-components/update
update versions
2 parents 3b71de6 + 9bf4c08 commit cc90741

File tree

10 files changed

+37
-32
lines changed

10 files changed

+37
-32
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313
- name: Set up OpenJDK
14-
uses: actions/setup-java@v2
14+
uses: actions/setup-java@v4
1515
with:
16-
java-version: '17'
16+
java-version: '21'
1717
cache: 'gradle'
1818
distribution: 'temurin'
1919
- run: make build

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
build:
2-
./gradlew clean build
2+
./gradlew clean build
33

44
lint:
55
./gradlew checkstyleMain checkstyleTest
66

77
test:
8-
./gradlew test
8+
./gradlew test

build.gradle.kts

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
2+
import org.gradle.api.tasks.testing.logging.TestLogEvent
3+
4+
plugins {
5+
java
6+
checkstyle
7+
id("com.github.ben-manes.versions") version "0.52.0"
8+
}
9+
10+
group = "io.hexlet"
11+
12+
version = "1.0-SNAPSHOT"
13+
14+
repositories { mavenCentral() }
15+
16+
dependencies {
17+
testImplementation(platform("org.junit:junit-bom:5.12.2"))
18+
testImplementation("org.junit.jupiter:junit-jupiter")
19+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
20+
}
21+
22+
tasks.test {
23+
useJUnitPlatform()
24+
testLogging {
25+
exceptionFormat = TestExceptionFormat.FULL
26+
events = mutableSetOf(TestLogEvent.FAILED, TestLogEvent.PASSED, TestLogEvent.SKIPPED)
27+
showStandardStreams = true
28+
}
29+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
-2.39 KB
Binary file not shown.
Binary file not shown.

lib/build.gradle

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

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
*/
99

1010
rootProject.name = 'java-arrays-as-sets'
11-
include('lib')
11+

lib/src/test/java/io/hexlet/utils/ArraysAsSetsTest.java renamed to src/test/java/io/hexlet/utils/ArraysAsSetsTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.hexlet.utils;
22

3-
import static org.junit.Assert.assertArrayEquals;
4-
3+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
54
import org.junit.jupiter.api.Test;
65

76
public class ArraysAsSetsTest {

0 commit comments

Comments
 (0)