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

Consolidate kernel and kore modules #4263

Merged
merged 8 commits into from Apr 23, 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.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .github/workflows/Dockerfile.maven-cache
Expand Up @@ -23,8 +23,7 @@ ADD pom.xml /home/$USER/.tmp-
ADD llvm-backend/pom.xml /home/$USER/.tmp-maven/llvm-backend/
ADD llvm-backend/src/main/native/llvm-backend/matching/pom.xml /home/$USER/.tmp-maven/llvm-backend/src/main/native/llvm-backend/matching/
ADD haskell-backend/pom.xml /home/$USER/.tmp-maven/haskell-backend/
ADD kernel/pom.xml /home/$USER/.tmp-maven/kernel/
ADD k-frontend/pom.xml /home/$USER/.tmp-maven/k-frontend/
ADD k-distribution/pom.xml /home/$USER/.tmp-maven/k-distribution/
ADD kore/pom.xml /home/$USER/.tmp-maven/kore/

RUN cd /home/$USER/.tmp-maven && mvn --batch-mode dependency:go-offline
4 changes: 3 additions & 1 deletion flake.nix
Expand Up @@ -54,12 +54,14 @@

k-framework = { haskell-backend-bins, llvm-kompile-libs }:
prev.callPackage ./nix/k.nix {
mvnHash = "sha256-3jjxkAOrm9JS5RqWZYCXgOj9tBSUPrdHex/Ifz6x+tQ=";
mvnHash = "sha256-DnY+Zx4fr3iuI24VjlnCVeQCcK6aHYYAEW13aUEzd+I=";
manualMvnArtifacts = [
"org.scala-lang:scala-compiler:2.13.13"
"ant-contrib:ant-contrib:1.0b3"
"org.apache.ant:ant-nodeps:1.8.1"
"org.apache.maven.wagon:wagon-provider-api:1.0-alpha-6"
"org.checkerframework:checker-qual:3.33.0"
"com.google.errorprone:error_prone_annotations:2.18.0"
];
manualMvnSourceArtifacts = [
"org.scala-sbt:compiler-bridge_2.13:1.8.0"
Expand Down
2 changes: 1 addition & 1 deletion haskell-backend/pom.xml
Expand Up @@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>com.runtimeverification.k</groupId>
<artifactId>kernel</artifactId>
<artifactId>k-frontend</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions k-distribution/pom.xml
Expand Up @@ -22,7 +22,7 @@
<dependencies>
<dependency>
<groupId>com.runtimeverification.k</groupId>
<artifactId>kernel</artifactId>
<artifactId>k-frontend</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -173,7 +173,7 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<version>3.1.2</version>
<executions>
<execution>
<id>copy-java-dependencies</id>
Expand Down
59 changes: 51 additions & 8 deletions kernel/pom.xml → k-frontend/pom.xml
Expand Up @@ -8,22 +8,22 @@
<artifactId>parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>kernel</artifactId>
<artifactId>k-frontend</artifactId>
<packaging>jar</packaging>

<name>K Framework Tool Kernel</name>
<name>K Framework Frontend</name>

<dependencies>
<dependency>
<groupId>com.runtimeverification.k</groupId>
<artifactId>scala-kore</artifactId>
<version>0.3.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.lsp4j</groupId>
<artifactId>org.eclipse.lsp4j</artifactId>
<version>0.19.0</version>
</dependency>
<dependency>
<groupId>com.runtimeverification.k</groupId>
<artifactId>kore</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
Expand Down Expand Up @@ -73,6 +73,16 @@
<artifactId>jsr305</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.3-jre</version>
</dependency>
<dependency>
<groupId>org.pcollections</groupId>
<artifactId>pcollections</artifactId>
<version>2.1.2</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
Expand Down Expand Up @@ -126,7 +136,11 @@
<version>1.4</version>
<classifier>linux64</classifier>
</dependency>

<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.78</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down Expand Up @@ -244,6 +258,35 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.8.1</version>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<args>
<arg>-Werror</arg>
<arg>-feature</arg>
<arg>-deprecation</arg>
</args>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
Expand Down
Expand Up @@ -43,7 +43,7 @@ public static String getKBase() {
* Returns the absolute path of the includes directory. Paths are computed relative to the
* location this class is running from. When it is run from a jar file it assumes it is in a k
* installation at lib/java/*.jar. When it is run from a .class file it assumes it is running
* within the K source project, from a class in kernel/target/classes/, and returns a path to
* within the K source project, from a class in k-frontend/target/classes/, and returns a path to
* k-distribution/include
*
* @return
Expand Down
File renamed without changes.