Skip to content

Commit

Permalink
Merge pull request #133 from hyperskill/master
Browse files Browse the repository at this point in the history
Release 10.0.0
  • Loading branch information
inuur authored Oct 10, 2022
2 parents f0d4599 + be14c9b commit 739ea31
Show file tree
Hide file tree
Showing 148 changed files with 7,205 additions and 199 deletions.
9 changes: 9 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Task: [#HSPC-](https://vyahhi.myjetbrains.com/youtrack/issue/HSPC-)

**Dependencies**
- !

**Reviewers**
- [ ] @

**Description**
15 changes: 15 additions & 0 deletions .github/actions/java11/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: 'Init environment'
description: 'Install dependencies'

runs:
using: "composite"
steps:
- uses: actions/checkout@v3
- name: Set up Java 11
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: "11"
- name: Install Dependencies
run: gradle resolveDependencies
shell: bash
15 changes: 15 additions & 0 deletions .github/actions/java12/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: 'Init environment'
description: 'Install dependencies'

runs:
using: "composite"
steps:
- uses: actions/checkout@v3
- name: Set up Java 12
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: "12"
- name: Install Dependencies
run: gradle resolveDependencies
shell: bash
15 changes: 15 additions & 0 deletions .github/actions/java13/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: 'Init environment'
description: 'Install dependencies'

runs:
using: "composite"
steps:
- uses: actions/checkout@v3
- name: Set up Java 13
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: "13"
- name: Install Dependencies
run: gradle resolveDependencies
shell: bash
15 changes: 15 additions & 0 deletions .github/actions/java14/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: 'Init environment'
description: 'Install dependencies'

runs:
using: "composite"
steps:
- uses: actions/checkout@v3
- name: Set up Java 14
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: "14"
- name: Install Dependencies
run: gradle resolveDependencies
shell: bash
15 changes: 15 additions & 0 deletions .github/actions/java15/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: 'Init environment'
description: 'Install dependencies'

runs:
using: "composite"
steps:
- uses: actions/checkout@v3
- name: Set up Java 15
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: "15"
- name: Install Dependencies
run: gradle resolveDependencies
shell: bash
15 changes: 15 additions & 0 deletions .github/actions/java16/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: 'Init environment'
description: 'Install dependencies'

runs:
using: "composite"
steps:
- uses: actions/checkout@v3
- name: Set up Java 16
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: "16"
- name: Install Dependencies
run: gradle resolveDependencies
shell: bash
15 changes: 15 additions & 0 deletions .github/actions/java17/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: 'Init environment'
description: 'Install dependencies'

runs:
using: "composite"
steps:
- uses: actions/checkout@v3
- name: Set up Java 17
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: "17"
- name: Install Dependencies
run: gradle resolveDependencies
shell: bash
15 changes: 15 additions & 0 deletions .github/actions/java18/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: 'Init environment'
description: 'Install dependencies'

runs:
using: "composite"
steps:
- uses: actions/checkout@v3
- name: Set up Java 18
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: "18"
- name: Install Dependencies
run: gradle resolveDependencies
shell: bash
76 changes: 76 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Checks
on: [ push ]

jobs:
Java_11:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/java11
- name: java version
run: java -version
- name: test
run: gradle test -i
Java_12:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/java12
- name: java version
run: java -version
- name: test
run: gradle test -i
Java_13:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/java13
- name: java version
run: java -version
- name: test
run: gradle test -i
Java_14:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/java14
- name: java version
run: java -version
- name: test
run: gradle test -i
Java_15:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/java15
- name: java version
run: java -version
- name: test
run: gradle test -i
Java_16:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/java16
- name: java version
run: java -version
- name: test
run: gradle test -i
Java_17:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/java17
- name: java version
run: java -version
- name: test
run: gradle test -i
Java_18:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/java18
- name: java version
run: java -version
- name: test
run: gradle test -i
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,5 @@ build/*
.gradle/*
gradlew
gradlew.bat

*.exe
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
plugins {
id 'java'
id 'java-library'
id 'checkstyle'
// id 'checkstyle' doesn't work with jitpack for some reason
// id 'org.jetbrains.kotlin.jvm' version '1.3.60'
}

group 'org.hyperskill'
version '8.2'
version '10'

sourceCompatibility = 1.8
sourceCompatibility = 11

repositories {
mavenCentral()
maven { url 'https://jitpack.io' }
}

dependencies {
api 'junit:junit:4.12'
api 'junit:junit:4.13.2'

// implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"

api 'org.assertj:assertj-swing-junit:3.9.2'
api 'org.apache.httpcomponents:httpclient:4.5.9'
api 'com.google.code.gson:gson:2.8.5'
api 'org.assertj:assertj-swing-junit:3.17.1'
api 'org.apache.httpcomponents:httpclient:4.5.13'
api 'com.google.code.gson:gson:2.8.9'

compileOnly 'org.projectlombok:lombok:1.18.16'
annotationProcessor 'org.projectlombok:lombok:1.18.16'
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
}

compileJava.options.encoding = 'UTF-8'
Expand Down Expand Up @@ -63,11 +63,11 @@ task resolveDependencies {
}

task createFatJar(type: Jar) {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
manifest {
attributes 'Main-Class': 'org.hyperskill.hstest.stage.StageTest'
}
from {
configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
}
with jar
Expand Down
1 change: 1 addition & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jdk: openjdk11
Loading

0 comments on commit 739ea31

Please sign in to comment.