Skip to content

Commit 3406881

Browse files
committed
update: Java 25, gradle 9.2.0, deps
1 parent b59a522 commit 3406881

File tree

10 files changed

+95
-74
lines changed

10 files changed

+95
-74
lines changed

.coursecreator/course/course.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"course_version" : 1,
3-
"summary" : "This is the Elevator Event, hosted by Together Java. Use at least Java 17.",
3+
"summary" : "This is the Elevator Event, hosted by Together Java. Use at least Java 25.",
44
"title" : "Elevator-Event-Together-Java",
5-
"programming_language" : "JAVA 17",
5+
"programming_language" : "JAVA 25",
66
"language" : "en",
77
"course_type" : "Marketplace",
88
"vendor" : {
@@ -23,7 +23,7 @@
2323
"text" : "a3Oc3sOKihNm0o8Cls6Am4BU5WKavemmrYTYXmzh/WuQfzHR3doZI/3hHs82WT1cfu+S8Hbqcvqsd43cOU6Yw54kL5PvpwnqxrWnvPVetJGUHMoxxksR8mJFs8Jtlq8VcqzcFjfuNpRml/q+9ODjaAcTvoyySlFWAYCpg23bQSmIJcptqVuLqWoVP26TfeVh"
2424
}
2525
},
26-
"description_text" : "Welcome to the **Elevator Event** hosted by **Together Java**!\r\n\r\n## What is this?\r\n\r\nThis event consists of a guided course, in which you will create an elevator system that\r\ntransports humans in a building from floor to floor, as well as an actual contest where you\r\nare required to finish the implementation, try to improve your solution to reduce the time humans\r\nhave to wait, and finally polish your submission.\r\n\r\nThe event is **ideal for beginners** who feel confident with writing\r\nsmall applications already. In fact, this task is inspired by a commonly executed application test for\r\nJunior developers at companies, called the _Elevator Test_.\r\n\r\n## Prizes\r\n\r\n### Jetbrains licenses\r\n\r\nAmong all working submissions (elevators have to eventually transport humans to their destinations),\r\nwe will **randomly** give away up to **2 annual licenses** for any [**JetBrains product**](https://www.jetbrains.com/products/).\r\n\r\n![JetBrains logo](https://i.imgur.com/h6jXoNY.png)\r\n\r\nThis will get you access to any of their 11 IDEs, 3 extensions and 2 profilers.\r\n\r\n![all products pack](https://i.imgur.com/IL4dDs0.png)\r\n\r\n### Role\r\n\r\nAdditionally, submissions will be graded, and the top users are awarded with\r\nthe fancy '_Ruler of Elevators_' role and a shiny badge!\r\n\r\n![role and badge](https://i.imgur.com/Uvg0WlA.png)\r\n\r\n## How to submit\r\n\r\nPlease submit your solution before the event ends per DM to any of the\r\nmoderators of Together Java.\r\n\r\nThe easiest way to share your results is by just zipping the whole project folder.\r\n\r\nWe will accept any format, as long as it is clear what you have changed in the source code.\r\n\r\nWhile the event is still ongoing, please do not promote your solution openly in the server\r\nthough, to not ruin the event for others.\r\n\r\n## Need help\r\n\r\nIf you have trouble solving the tasks, or something is just unclear to you,\r\nfeel free to openly ask in the server.\r\n\r\nBesides being a contest, this is also meant as a learning experience.\r\nSo we will definitely provide you with assistance \uD83D\uDC4D\r\n\r\nEnjoy and happy coding \uD83D\uDE4C\r\n\r\n### Known issues\r\n\r\n#### Gradle uses wrong JVM\r\n\r\nIn case you encounter an error message, such as:\r\n\r\n![Cause: error: invalid source release: 17](https://i.imgur.com/xrT39xi.png)\r\n\r\nGo to your Gradle settings (you can find them on the right, or directly in Intellij Settings):\r\n\r\n![gradle settings](https://i.imgur.com/7ECw8Jw.png)\r\n\r\nand select a JDK 17 instead of `#JAVA_INTERNAL`:\r\n\r\n![select version](https://i.imgur.com/h1FFXYn.png)\r\n",
26+
"description_text" : "Welcome to the **Elevator Event** hosted by **Together Java**!\r\n\r\n## What is this?\r\n\r\nThis event consists of a guided course, in which you will create an elevator system that\r\ntransports humans in a building from floor to floor, as well as an actual contest where you\r\nare required to finish the implementation, try to improve your solution to reduce the time humans\r\nhave to wait, and finally polish your submission.\r\n\r\nThe event is **ideal for beginners** who feel confident with writing\r\nsmall applications already. In fact, this task is inspired by a commonly executed application test for\r\nJunior developers at companies, called the _Elevator Test_.\r\n\r\n## Prizes\r\n\r\n### Jetbrains licenses\r\n\r\nAmong all working submissions (elevators have to eventually transport humans to their destinations),\r\nwe will **randomly** give away up to **2 annual licenses** for any [**JetBrains product**](https://www.jetbrains.com/products/).\r\n\r\n![JetBrains logo](https://i.imgur.com/h6jXoNY.png)\r\n\r\nThis will get you access to any of their 11 IDEs, 3 extensions and 2 profilers.\r\n\r\n![all products pack](https://i.imgur.com/IL4dDs0.png)\r\n\r\n### Role\r\n\r\nAdditionally, submissions will be graded, and the top users are awarded with\r\nthe fancy '_Ruler of Elevators_' role and a shiny badge!\r\n\r\n![role and badge](https://i.imgur.com/Uvg0WlA.png)\r\n\r\n## How to submit\r\n\r\nPlease submit your solution before the event ends per DM to any of the\r\nmoderators of Together Java.\r\n\r\nThe easiest way to share your results is by just zipping the whole project folder.\r\n\r\nWe will accept any format, as long as it is clear what you have changed in the source code.\r\n\r\nWhile the event is still ongoing, please do not promote your solution openly in the server\r\nthough, to not ruin the event for others.\r\n\r\n## Need help\r\n\r\nIf you have trouble solving the tasks, or something is just unclear to you,\r\nfeel free to openly ask in the server.\r\n\r\nBesides being a contest, this is also meant as a learning experience.\r\nSo we will definitely provide you with assistance \uD83D\uDC4D\r\n\r\nEnjoy and happy coding \uD83D\uDE4C\r\n\r\n### Known issues\r\n\r\n#### Gradle uses wrong JVM\r\n\r\nIn case you encounter an error message, such as:\r\n\r\n![Cause: error: invalid source release: 25](https://i.imgur.com/xrT39xi.png)\r\n\r\nGo to your Gradle settings (you can find them on the right, or directly in Intellij Settings):\r\n\r\n![gradle settings](https://i.imgur.com/7ECw8Jw.png)\r\n\r\nand select a JDK 17 instead of `#JAVA_INTERNAL`:\r\n\r\n![select version](https://i.imgur.com/h1FFXYn.png)\r\n",
2727
"description_format" : "MD",
2828
"task_type" : "theory"
2929
},
@@ -709,4 +709,4 @@
709709
],
710710
"version" : 13,
711711
"edu_plugin_version" : "2022.7-2022.2-291"
712-
}
712+
}

Introduction/Overview/task.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ Enjoy and happy coding 🙌
5959

6060
In case you encounter an error message, such as:
6161

62-
![Cause: error: invalid source release: 17](https://i.imgur.com/xrT39xi.png)
62+
![Cause: error: invalid source release: 25](https://i.imgur.com/xrT39xi.png)
6363

6464
Go to your Gradle settings (you can find them on the right, or directly in Intellij Settings):
6565

6666
![gradle settings](https://i.imgur.com/7ECw8Jw.png)
6767

68-
and select a JDK 17 instead of `#JAVA_INTERNAL`:
68+
and select a JDK 25 instead of `#JAVA_INTERNAL`:
6969

7070
![select version](https://i.imgur.com/h1FFXYn.png)

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ To participate in this event, you need:
4242

4343
* [IntelliJ IDEA](https://www.jetbrains.com/idea/download) (the free Community Edition is more than enough)
4444
* [EduTools plugin](https://plugins.jetbrains.com/plugin/10081-edutools)
45-
* [Java 17](https://adoptium.net/) (or newer)
45+
* [Java 25](https://adoptium.net/) (or newer)
4646
* Download the event from [ElevatorEventTogetherJava.zip](https://github.com/Together-Java/ElevatorEvent/releases)
4747

4848
There is also a special version of IntelliJ that comes with EduTools
@@ -54,9 +54,9 @@ Once you got that, import the zip-file as course into EduTools:
5454
![Open course from disk](https://i.imgur.com/uHurpw1.png)
5555
![Select course zip](https://i.imgur.com/DoWwBl3.png)
5656

57-
Make sure to select Java 17 and hit the **Start** button.
57+
Make sure to select Java 25 and hit the **Start** button.
5858

59-
![Select Java 17 and start](https://i.imgur.com/yWM37Oo.png)
59+
![Select Java 25 and start](https://i.imgur.com/yWM37Oo.png)
6060

6161
IntelliJ now opens the event, it will look something like:
6262

@@ -97,12 +97,12 @@ Enjoy and happy coding 🙌
9797

9898
In case you encounter an error message, such as:
9999

100-
![Cause: error: invalid source release: 17](https://i.imgur.com/xrT39xi.png)
100+
![Cause: error: invalid source release: 25](https://i.imgur.com/xrT39xi.png)
101101

102102
Go to your Gradle settings (you can find them on the right, or directly in Intellij Settings):
103103

104104
![gradle settings](https://i.imgur.com/7ECw8Jw.png)
105105

106-
and select a JDK 17 instead of `#JAVA_INTERNAL`:
106+
and select a JDK 25 instead of `#JAVA_INTERNAL`:
107107

108108
![select version](https://i.imgur.com/h1FFXYn.png)

build.gradle

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ buildscript {
44
}
55
}
66

7+
plugins {
8+
id 'java'
9+
id 'application'
10+
}
11+
712
def printOutput(def output) {
813
return tasks.create("printOutput") {
914
println "#educational_plugin_checker_version 1"
@@ -19,15 +24,25 @@ subprojects {
1924
apply plugin: 'application'
2025
apply plugin: 'java'
2126

22-
sourceCompatibility = 17
27+
java {
28+
toolchain {
29+
languageVersion = JavaLanguageVersion.of(25)
30+
}
31+
sourceCompatibility = JavaVersion.VERSION_25
32+
targetCompatibility = JavaVersion.VERSION_25
33+
}
2334

2435
repositories {
2536
mavenCentral()
2637
}
2738

2839
dependencies {
29-
testImplementation 'org.mockito:mockito-core:4.0.0'
30-
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
40+
testImplementation 'org.mockito:mockito-core:5.20.0'
41+
42+
testImplementation 'org.junit.jupiter:junit-jupiter-api:6.0.1'
43+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:6.0.1'
44+
testImplementation 'org.junit.jupiter:junit-jupiter-params:6.0.1'
45+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:6.0.1'
3146
}
3247

3348
sourceSets {
@@ -39,7 +54,9 @@ subprojects {
3954
}
4055
}
4156

42-
mainClassName = project.hasProperty("mainClass") ? project.getProperty("mainClass") : ""
57+
application {
58+
mainClass = project.hasProperty("mainClass") ? project.getProperty("mainClass") : ""
59+
}
4360

4461
if (project.hasProperty("educationalRun") && "true".equalsIgnoreCase(project.getProperty("educationalRun"))) {
4562
def runOutput = new ByteArrayOutputStream()
@@ -51,21 +68,3 @@ subprojects {
5168
useJUnitPlatform()
5269
}
5370
}
54-
55-
project(':util') {
56-
dependencies {
57-
testImplementation 'org.mockito:mockito-core:4.0.0'
58-
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
59-
}
60-
61-
test {
62-
useJUnitPlatform()
63-
}
64-
}
65-
66-
configure(subprojects.findAll { it.name != 'util' }) {
67-
dependencies {
68-
implementation project(':util').sourceSets.main.output
69-
testImplementation project(':util').sourceSets.test.output
70-
}
71-
}

course-info.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
type: marketplace
22
title: Elevator-Event-Together-Java
33
language: English
4-
summary: "This is the Elevator Event, hosted by Together Java. Use at least Java 17."
4+
summary: "This is the Elevator Event, hosted by Together Java. Use at least Java 25."
5+
vendor:
6+
name: Daniel Tischner
57
programming_language: Java
6-
programming_language_version: 17
8+
programming_language_version: 25
79
content:
810
- Introduction
911
- Course
1012
- Contest
13+
environment_settings:
14+
jvm_language_level: JDK_17
1115
additional_files:
1216
- name: .idea/inspectionProfiles/Project_Default.xml
1317
- name: LICENSE

gradle/wrapper/gradle-wrapper.jar

-13.9 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 32 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 22 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)