Merge pull request #95 from vorpal-research/release-preparation

Release preparation

.github/workflows/jdk8-cd.yml

@@ -0,0 +1,39 @@
+name: Java CD
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  publish:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build sources
+        id: build
+        run: |
+          mvn versions:set -DnewVersion=${{ github.event.release.tag_name }}
+          mvn package --file pom.xml -s .github/github-settings.xml
+
+      - name: Clean temporary files after the tests
+        run: rm -rf test-temp/
+
+      - name: Create zip archive with the release
+        run: zip release.zip ./* -r
+
+      - name: Attach zip archive to the release
+        id: upload-source-asset
+        uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: release.zip
+          asset_name: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.zip
+          asset_content_type: application/zip

core/pom.xml → kex-core/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>core</artifactId>
+    <artifactId>kex-core</artifactId>
 
     <properties>
         <ini4j.version>0.5.4</ini4j.version>

core/src/main/kotlin/org/vorpal/research/kex/asm/manager/CoverageCounter.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/asm/manager/CoverageCounter.kt

@@ -8,7 +8,7 @@ import org.vorpal.research.kfg.ir.Class
 import org.vorpal.research.kfg.ir.Method
 import org.vorpal.research.kfg.visitor.MethodVisitor
 import org.vorpal.research.kthelper.logging.log
-import java.util.Locale
+import java.util.*
 
 data class CoverageInfo(
     val bodyCovered: Int,

core/src/main/kotlin/org/vorpal/research/kex/config/GlobalConfig.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/config/GlobalConfig.kt

@@ -1,7 +1,7 @@
 package org.vorpal.research.kex.config
 
-import org.vorpal.research.kex.util.outputDirectory
 import org.slf4j.MDC
+import org.vorpal.research.kex.util.outputDirectory
 
 val kexConfig: GlobalConfig by lazy { GlobalConfig() }
 

core/src/main/kotlin/org/vorpal/research/kex/evolutions/Utils.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/evolutions/Utils.kt

@@ -4,13 +4,13 @@ import org.vorpal.research.kfg.ir.value.instruction.BinaryOpcode
 import org.vorpal.research.kfg.ir.value.instruction.UnaryOpcode
 import ru.spbstu.Apply
 import ru.spbstu.Symbolic
+import ru.spbstu.div
 import ru.spbstu.gcd
-import ru.spbstu.plus
 import ru.spbstu.minus
-import ru.spbstu.times
-import ru.spbstu.div
+import ru.spbstu.plus
 import ru.spbstu.shl
 import ru.spbstu.shr
+import ru.spbstu.times
 import ru.spbstu.unaryMinus
 
 fun BinaryOpcode.toFunc(): (Symbolic, Symbolic) -> Symbolic = when (this) {

core/src/main/kotlin/org/vorpal/research/kex/random/easyrandom/collections.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/random/easyrandom/collections.kt

@@ -6,16 +6,7 @@ import org.vorpal.research.kex.config.kexConfig
 import org.vorpal.research.kex.util.isAbstract
 import org.vorpal.research.kthelper.assert.unreachable
 import org.vorpal.research.kthelper.logging.log
-import java.util.ArrayList
-import java.util.ArrayDeque
-import java.util.EnumSet
-import java.util.EnumMap
-import java.util.LinkedList
-import java.util.Stack
-import java.util.Queue
-import java.util.PriorityQueue
-import java.util.TreeSet
-import java.util.TreeMap
+import java.util.*
 import java.util.concurrent.ConcurrentSkipListMap
 import java.util.concurrent.ConcurrentSkipListSet
 

core/src/main/kotlin/org/vorpal/research/kex/smt/Solver.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/smt/Solver.kt

@@ -45,6 +45,7 @@ interface AbstractAsyncSMTSolver : Closeable {
     suspend fun isViolatedAsync(state: PredicateState, query: PredicateState): Result
 }
 
+@Suppress("unused")
 @AbstractIncrementalSolver
 interface AbstractIncrementalSMTSolver : AbstractSMTSolver, Closeable {
     fun isSatisfiable(

core/src/main/kotlin/org/vorpal/research/kex/state/ChainState.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/state/ChainState.kt

@@ -3,7 +3,6 @@ package org.vorpal.research.kex.state
 import kotlinx.serialization.Serializable
 import org.vorpal.research.kex.InheritorOf
 import org.vorpal.research.kex.state.predicate.Predicate
-import org.vorpal.research.kthelper.defaultHashCode
 
 @InheritorOf("State")
 @Serializable

core/src/main/kotlin/org/vorpal/research/kex/state/predicate/ArrayStorePredicate.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/state/predicate/ArrayStorePredicate.kt

@@ -21,6 +21,7 @@ class ArrayStorePredicate(
         @Required @Contextual override val location: Location = Location()) : Predicate() {
     override val operands by lazy { listOf(arrayRef, value) }
 
+    @Suppress("unused")
     val componentType: KexType
         get() = (arrayRef.type as? KexReference)?.reference ?: unreachable { log.error("Non-array type of array ref") }
 
@@ -34,4 +35,4 @@ class ArrayStorePredicate(
             else -> predicate(type, location) { ref.store(store) }
         }
     }
-}
+}

core/src/main/kotlin/org/vorpal/research/kex/state/term/ArgumentTerm.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/state/term/ArgumentTerm.kt

@@ -4,7 +4,6 @@ import kotlinx.serialization.Serializable
 import org.vorpal.research.kex.InheritorOf
 import org.vorpal.research.kex.ktype.KexType
 import org.vorpal.research.kex.state.transformer.Transformer
-import org.vorpal.research.kthelper.defaultHashCode
 
 @InheritorOf("Term")
 @Serializable

core/src/main/kotlin/org/vorpal/research/kex/state/transformer/ConstStringCollector.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/state/transformer/ConstStringCollector.kt

@@ -56,7 +56,7 @@ class ConstStringCollector : StringInfoContext(), Transformer<ConstStringCollect
             && predicate.length is ConstIntTerm
             && predicate.elements.all { it.isConst }
         ) {
-            valueArrays[predicate.lhv] = predicate.elements.mapTo(mutableListOf()) { it.numericValue.toChar() }
+            valueArrays[predicate.lhv] = predicate.elements.mapTo(mutableListOf()) { it.numericValue.toInt().toChar() }
         }
         return super.transformNewArrayInitializer(predicate)
     }
@@ -84,7 +84,7 @@ class ConstStringCollector : StringInfoContext(), Transformer<ConstStringCollect
             && predicate.value.isConst
         ) {
             valueArrays[arrayIndex.arrayRef]!![arrayIndex.index.numericValue.toInt()] =
-                predicate.value.numericValue.toChar()
+                predicate.value.numericValue.toInt().toChar()
         }
         return super.transformArrayStore(predicate)
     }
@@ -96,7 +96,7 @@ class ConstStringCollector : StringInfoContext(), Transformer<ConstStringCollect
             && predicate.value.isConst
         ) {
             valueArrays[arrayIndex.arrayRef]!![arrayIndex.index.numericValue.toInt()] =
-                predicate.value.numericValue.toChar()
+                predicate.value.numericValue.toInt().toChar()
         }
         return super.transformArrayInitializer(predicate)
     }

core/src/main/kotlin/org/vorpal/research/kex/state/transformer/TermRemapper.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/state/transformer/TermRemapper.kt

@@ -2,9 +2,9 @@ package org.vorpal.research.kex.state.transformer
 
 import org.vorpal.research.kex.state.term.ArgumentTerm
 import org.vorpal.research.kex.state.term.LambdaTerm
-import org.vorpal.research.kex.state.term.ValueTerm
 import org.vorpal.research.kex.state.term.ReturnValueTerm
 import org.vorpal.research.kex.state.term.Term
+import org.vorpal.research.kex.state.term.ValueTerm
 import org.vorpal.research.kex.state.term.term
 import org.vorpal.research.kex.trace.symbolic.PathClause
 import org.vorpal.research.kex.trace.symbolic.PersistentSymbolicState

core/src/main/kotlin/org/vorpal/research/kex/util/rt.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/util/rt.kt

@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package org.vorpal.research.kex.util
 
 import org.vorpal.research.kex.config.Config
@@ -12,6 +14,7 @@ import kotlin.io.path.readLines
 
 val Config.outputDirectory: Path get() = getPathValue("kex", "outputDir")!!.normalize()
 
+@Deprecated("kex now does not write instrumented code into a directory")
 val Config.instrumentedCodeDirectory: Path
     get() {
         val instrumentedDirName = getStringValue("output", "instrumentedDir", "instrumented")

core/src/main/kotlin/org/vorpal/research/kex/util/util.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/util/util.kt

@@ -15,7 +15,7 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.SimpleFileVisitor
 import java.nio.file.attribute.BasicFileAttributes
-import java.util.Locale
+import java.util.*
 import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.deleteRecursively
 

core/src/main/kotlin/org/vorpal/research/kex/util/zip.kt → kex-core/src/main/kotlin/org/vorpal/research/kex/util/zip.kt

@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package org.vorpal.research.kex.util
 
 import java.io.IOException

kex-executor/pom.xml

@@ -31,7 +31,7 @@
 
         <dependency>
             <groupId>org.vorpal.research</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>kex-core</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -56,7 +56,6 @@
 
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
-        <testSourceDirectory>src/test/kotlin</testSourceDirectory>
 
         <plugins>
             <plugin>

kex-ksmt/pom.xml

@@ -30,12 +30,12 @@
 
         <dependency>
             <groupId>org.vorpal.research</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>kex-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.vorpal.research</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>kex-core</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
             <type>test-jar</type>

kex-runner/pom.xml

@@ -48,12 +48,12 @@
 
         <dependency>
             <groupId>org.vorpal.research</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>kex-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.vorpal.research</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>kex-core</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
             <type>test-jar</type>

kex-runner/src/main/kotlin/org/vorpal/research/kex/asm/analysis/util/extensions.kt

@@ -63,7 +63,6 @@ suspend fun Method.checkAsync(
         .mapValues { it.value.rtMapped }
         .toTypeMap()
     val result = checker.prepareAndCheck(this, clauses + query, concreteTypeInfo, enableInlining)
-//    log.error("Checking clause type ${state.path.last().type}, acquired $result")
     if (result !is Result.SatResult) {
         return null
     }

pom.xml

@@ -11,7 +11,7 @@
     <version>0.0.1</version>
     <modules>
         <module>kex-test</module>
-        <module>core</module>
+        <module>kex-core</module>
         <module>kex-annotation-processor</module>
         <module>kex-runner</module>
         <module>kex-executor</module>