Skip to content

Commit

Permalink
Bump version again.
Browse files Browse the repository at this point in the history
  • Loading branch information
gchallen committed May 28, 2021
1 parent 9eb8f0c commit 09e5d44
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import java.io.StringWriter
import java.util.Properties

group = "com.github.cs125-illinois"
version = "2021.5.6"
version = "2021.5.7"

plugins {
kotlin("jvm") version "1.5.10"
Expand Down
24 changes: 12 additions & 12 deletions src/main/kotlin/Solution.kt
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ class Solution(val solution: Class<*>) {
private val initializers = initializer?.let { setOf(it) } ?: setOf()
val receiversAndInitializers = receiverGenerators + initializers

val fauxStatic = solution.superclass != Any::class.java
&& solution.declaredFields.all { it.isJenisol() || it.isStatic() }
&& solution.declaredMethods.all {
it.isJenisol() ||
(it.returnType != solution && !it.receiverParameter() && !it.objectParameter())
}
&& solution.declaredConstructors.let { it.size == 1 && it.first().parameterCount == 0 }
val fauxStatic = solution.superclass != Any::class.java &&
solution.declaredFields.all { it.isJenisol() || it.isStatic() } &&
solution.declaredMethods.all {
it.isJenisol() ||
(it.returnType != solution && !it.receiverParameter() && !it.objectParameter())
} &&
solution.declaredConstructors.let { it.size == 1 && it.first().parameterCount == 0 }

val generatorFactory: GeneratorFactory = GeneratorFactory(allExecutables + initializers, this)

Expand Down Expand Up @@ -321,11 +321,11 @@ fun Executable.fullName(): String {
else -> error("Unknown executable type")
}
return "${visibilityModifier ?: ""}${
if (isStatic()) {
"static "
} else {
""
}
if (isStatic()) {
"static "
} else {
""
}
}$returnType$name(${parameters.joinToString(", ") { it.type.prettyPrint() }})"
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=2021.5.6
version=2021.5.7

0 comments on commit 09e5d44

Please sign in to comment.