diff --git a/appLab1/build.gradle.kts b/appLab1/build.gradle.kts index 32f2b3a..9d3c32e 100644 --- a/appLab1/build.gradle.kts +++ b/appLab1/build.gradle.kts @@ -22,7 +22,7 @@ java { } application { - mainClass = "com.github.hummel.ads.MainKt" + mainClass = "com.github.hummel.ads.lab1.MainKt" } tasks { @@ -33,7 +33,7 @@ tasks { manifest { attributes( mapOf( - "Main-Class" to "com.github.hummel.ads.MainKt" + "Main-Class" to "com.github.hummel.ads.lab1.MainKt" ) ) } diff --git a/appLab1/src/main/kotlin/com/github/hummel/ads/Main.kt b/appLab1/src/main/kotlin/com/github/hummel/ads/lab1/Main.kt similarity index 99% rename from appLab1/src/main/kotlin/com/github/hummel/ads/Main.kt rename to appLab1/src/main/kotlin/com/github/hummel/ads/lab1/Main.kt index 2728370..08a539d 100644 --- a/appLab1/src/main/kotlin/com/github/hummel/ads/Main.kt +++ b/appLab1/src/main/kotlin/com/github/hummel/ads/lab1/Main.kt @@ -1,4 +1,4 @@ -package com.github.hummel.ads +package com.github.hummel.ads.lab1 import hummel.Room.RoomType import hummel.Room.WindowType diff --git a/appLab2/build.gradle.kts b/appLab2/build.gradle.kts index 32f2b3a..8dc08e4 100644 --- a/appLab2/build.gradle.kts +++ b/appLab2/build.gradle.kts @@ -22,7 +22,7 @@ java { } application { - mainClass = "com.github.hummel.ads.MainKt" + mainClass = "com.github.hummel.ads.lab2.MainKt" } tasks { @@ -33,7 +33,7 @@ tasks { manifest { attributes( mapOf( - "Main-Class" to "com.github.hummel.ads.MainKt" + "Main-Class" to "com.github.hummel.ads.lab2.MainKt" ) ) } diff --git a/appLab2/src/main/kotlin/com/github/hummel/ads/Main.kt b/appLab2/src/main/kotlin/com/github/hummel/ads/lab2/Main.kt similarity index 99% rename from appLab2/src/main/kotlin/com/github/hummel/ads/Main.kt rename to appLab2/src/main/kotlin/com/github/hummel/ads/lab2/Main.kt index 0b04cb9..817a482 100644 --- a/appLab2/src/main/kotlin/com/github/hummel/ads/Main.kt +++ b/appLab2/src/main/kotlin/com/github/hummel/ads/lab2/Main.kt @@ -1,4 +1,4 @@ -package com.github.hummel.ads +package com.github.hummel.ads.lab2 private var list: MutableList = ArrayList() diff --git a/appLab3/build.gradle.kts b/appLab3/build.gradle.kts index 32f2b3a..8f17014 100644 --- a/appLab3/build.gradle.kts +++ b/appLab3/build.gradle.kts @@ -22,7 +22,7 @@ java { } application { - mainClass = "com.github.hummel.ads.MainKt" + mainClass = "com.github.hummel.ads.lab3.MainKt" } tasks { @@ -33,7 +33,7 @@ tasks { manifest { attributes( mapOf( - "Main-Class" to "com.github.hummel.ads.MainKt" + "Main-Class" to "com.github.hummel.ads.lab3.MainKt" ) ) } diff --git a/appLab3/src/main/kotlin/com/github/hummel/ads/Main.kt b/appLab3/src/main/kotlin/com/github/hummel/ads/lab3/Main.kt similarity index 99% rename from appLab3/src/main/kotlin/com/github/hummel/ads/Main.kt rename to appLab3/src/main/kotlin/com/github/hummel/ads/lab3/Main.kt index 1714481..b79dcb0 100644 --- a/appLab3/src/main/kotlin/com/github/hummel/ads/Main.kt +++ b/appLab3/src/main/kotlin/com/github/hummel/ads/lab3/Main.kt @@ -1,4 +1,4 @@ -package com.github.hummel.ads +package com.github.hummel.ads.lab3 private const val rr: String = "R) --> " private const val l: String = "L) " diff --git a/appLab4/build.gradle.kts b/appLab4/build.gradle.kts index 32f2b3a..0d1804a 100644 --- a/appLab4/build.gradle.kts +++ b/appLab4/build.gradle.kts @@ -22,7 +22,7 @@ java { } application { - mainClass = "com.github.hummel.ads.MainKt" + mainClass = "com.github.hummel.ads.lab4.MainKt" } tasks { @@ -33,7 +33,7 @@ tasks { manifest { attributes( mapOf( - "Main-Class" to "com.github.hummel.ads.MainKt" + "Main-Class" to "com.github.hummel.ads.lab4.MainKt" ) ) } diff --git a/appLab4/src/main/kotlin/com/github/hummel/ads/Main.kt b/appLab4/src/main/kotlin/com/github/hummel/ads/lab4/Main.kt similarity index 99% rename from appLab4/src/main/kotlin/com/github/hummel/ads/Main.kt rename to appLab4/src/main/kotlin/com/github/hummel/ads/lab4/Main.kt index e2048fd..21d4b7a 100644 --- a/appLab4/src/main/kotlin/com/github/hummel/ads/Main.kt +++ b/appLab4/src/main/kotlin/com/github/hummel/ads/lab4/Main.kt @@ -1,4 +1,4 @@ -package com.github.hummel.ads +package com.github.hummel.ads.lab4 import java.util.* import kotlin.math.max