Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First task #3

Merged
merged 11 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ In the `.github/workflows` directory, you can find definitions for the following
[file:gradle.properties]: ./gradle.properties
[file:course-info.yaml]: ./course-info.yaml
[file:courseignore]: .courseignore
[file:course.lesson.tests]: ./courseSection/courseLesson/programmingTask/test/Tests.kt
[file:course.lesson.tests]: courseSection/psi/programmingTask/test/Tests.kt
[file:course.framework.lesson.tests]: ./courseSection/courseFrameworkLesson/programmingTask/test/Tests.kt

[gradle]: https://gradle.org
Expand Down
47 changes: 39 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ plugins {
val kotlinVersion = "1.9.0"
id("org.jetbrains.kotlin.jvm") version kotlinVersion apply false
id("io.gitlab.arturbosch.detekt") version "1.23.1"
id("org.jetbrains.intellij") version "1.16.1"
}

intellij {
version.set("2023.1.2")
type.set("IC")
plugins.set(listOf("com.intellij.java", "org.jetbrains.kotlin"))
downloadSources.set(true)
updateSinceUntilBuild.set(true)
}

val detektReportMerge by tasks.registering(io.gitlab.arturbosch.detekt.report.ReportMergeTask::class) {
Expand All @@ -26,6 +35,7 @@ allprojects {
}
}


tasks {
wrapper {
gradleVersion = gradleProperties("gradleVersion").get()
Expand Down Expand Up @@ -59,12 +69,6 @@ configure(subprojects) {
// By default, only the core module is included
implementation("org.jetbrains.academy.test.system:core:2.0.5")

val junitJupiterVersion = "5.9.0"
implementation("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion")
runtimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion")
implementation("org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion")
runtimeOnly("org.junit.platform:junit-platform-console:1.9.0")

val detektVersion = "1.22.0"
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion")
implementation("io.gitlab.arturbosch.detekt:detekt-formatting:$detektVersion")
Expand All @@ -85,8 +89,6 @@ configure(subprojects) {

// This part is necessary for the JetBrains Academy plugin
withType<Test> {
useJUnitPlatform()

outputs.upToDateWhen { false }

addTestListener(object : TestListener {
Expand All @@ -113,6 +115,35 @@ configure(subprojects) {

// We have to store tests inside test folder directly
configure(subprojects.filter { it.name != "common" }) {
apply {
plugin("org.jetbrains.intellij")
}

intellij {
version.set("2023.1.2")
type.set("IC")
plugins.set(listOf("com.intellij.java", "org.jetbrains.kotlin"))
downloadSources.set(true)
updateSinceUntilBuild.set(true)
}

val jvmVersion = gradleProperties("jvmVersion").get()
tasks {
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions {
jvmTarget = jvmVersion
}
}

withType<JavaCompile> {
sourceCompatibility = jvmVersion
targetCompatibility = jvmVersion
}

withType<org.jetbrains.intellij.tasks.BuildSearchableOptionsTask>()
.forEach { it.enabled = false }
}

sourceSets {
getByName("main").java.srcDirs("src")
getByName("test").java.srcDirs("test")
Expand Down
6 changes: 0 additions & 6 deletions courseSection/courseFrameworkLesson/lesson-info.yaml

This file was deleted.

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions courseSection/courseFrameworkLesson/programmingTask/task-info.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions courseSection/courseFrameworkLesson/programmingTask/task.md

This file was deleted.

This file was deleted.

This file was deleted.

58 changes: 0 additions & 58 deletions courseSection/courseFrameworkLesson/programmingTask/test/Tests.kt

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions courseSection/courseFrameworkLesson/theoryTask/task-info.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions courseSection/courseFrameworkLesson/theoryTask/task.md

This file was deleted.

5 changes: 0 additions & 5 deletions courseSection/courseLesson/lesson-info.yaml

This file was deleted.

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions courseSection/courseLesson/programmingTask/task-info.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions courseSection/courseLesson/programmingTask/task.md

This file was deleted.

This file was deleted.

8 changes: 0 additions & 8 deletions courseSection/courseLesson/programmingTask/test/MainClass.kt

This file was deleted.

58 changes: 0 additions & 58 deletions courseSection/courseLesson/programmingTask/test/Tests.kt

This file was deleted.

This file was deleted.

Loading
Loading