merge repair, repair nightlydeploy.yml

wadoon · wadoon · commit ad12ce1c2f2e · 2026-03-28T19:36:36.000+01:00
diff --git a/.github/workflows/nightlydeploy.yml b/.github/workflows/nightlydeploy.yml
@@ -3,7 +3,7 @@ name: Weekly Builds of KeY
 on:
   workflow_dispatch:
   schedule:
-    - cron:  '0 5 * * 1' # every monday morning
+    - cron: '0 5 * * 1' # every monday morning
 
 permissions:
   contents: write
@@ -24,49 +24,31 @@ jobs:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: 'temurin'
           cache: 'gradle'
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
 
       - name: Build with Gradle
-        run: ./gradlew --parallel assemble
+        run: ./gradlew --parallel assemble javadoc alldoc
 
-  doc:
-    needs: [build]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v5
+      - name: Upload ShadowJar
+        uses: actions/upload-artifact@v7
         with:
-          java-version: ${{ env.JAVA_VERSION }}
-          distribution: 'temurin'
-          cache: 'gradle'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-
-      - name: Build Documentation with Gradle
-        run: ./gradlew alldoc
+          name: shadowjars
+          path: "*/build/libs/*-exe.jar"
+          retention-days: 1
 
       - name: Package
         run: tar cvf key-javadoc.tar.xz build/docs/javadoc
 
-  deploy:
-    needs: [build, doc]
-    runs-on: ubuntu-latest
-    steps:
       - name: Upload Javadoc
         uses: actions/upload-artifact@v7
         with:
           name: javadoc
-          path: "javadoc.tar.xz"
-
-      - name: Upload ShadowJar
-        uses: actions/upload-artifact@v7
-        with:
-          name: shadowjars
-          path: "*/build/libs/*-exe.jar"
+          path: "key-javadoc.tar.xz"
+          retention-days: 1
 
       - name: Delete previous nightly release
         continue-on-error: true
@@ -79,29 +61,18 @@ jobs:
         id: create_release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |          
+        run: |
           gh release create --generate-notes --title "Nightly Release" \
              --prerelease --notes-start-tag KEY-2.12.3 \
-             nightly key.ui/build/libs/key-*-exe.jar
-
-  deploy-maven:
-    needs: [ build, doc ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v5
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
-          distribution: 'temurin'
-          cache: 'gradle'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+             nightly key.ui/build/libs/key-*-exe.jar key-javadoc.tar.xz
 
+      - run: export GPG_TTY=$(tty)
       - name: Upload to SNAPSHOT repository
-        run: ./gradlew publishMavenJavaPublicationToKEYLABRepository
+        run: ./gradlew --parallel publishMavenJavaPublicationToKEYLABRepository
         env:
           BUILD_NUMBER: "SNAPSHOT"
           GITLAB_DEPLOY_TOKEN: ${{ secrets.GITLAB_DEPLOY_TOKEN }}
+#          SIGNING_KEY_ID: ${{secrents.SIGNING_KEY_ID}}
+#          GPG_PRIVATE_KEY: ${{secrents.GPG_PRIVATE_KEY}}
+#          GPG_PASSPHRASE: ${{secrents.GPG_PASSPHRASE}}
 
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,4 @@
-plugins {
+    plugins {
     //Support for IntelliJ IDEA
     //https://docs.gradle.org/current/userguide/idea_plugin.html
     id("idea")
@@ -17,6 +17,8 @@ plugins {
 
     // Plugin for publishing via the new Nexus API
     id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
+
+    id "signing"
 }
 
 
@@ -36,7 +38,7 @@ static def getDate() {
 def build = System.env.BUILD_NUMBER == null ? "-dev" : "-${System.env.BUILD_NUMBER}"
 
 group = "org.key-project"
-version = "2.13.0$build"
+version = "3.0.0$build"
 
 subprojects {
     apply plugin: "java"
@@ -348,14 +350,24 @@ subprojects {
                 }
             }
         }
-
         signing {
-            useGpgCmd() // works better than the Java implementation, which requires PGP keyrings.
-            sign publishing.publications.mavenJava
+            //sign publishing.publications.mavenJava
         }
     }
 }
 
+signing {
+    // does not work
+    if(System.getenv("GPG_PRIVATE_KEY") == null) {
+        useGpgCmd() // works better than the Java implementation, which requires PGP keyrings.
+    } else{
+        useInMemoryPgpKeys(
+                System.getenv("SIGNING_KEY_ID"),
+                System.getenv("GPG_PRIVATE_KEY"),
+                System.getenv("GPG_PASSPHRASE")
+        )
+    }
+}
 
 nexusPublishing {
     repositories {
@@ -405,12 +417,10 @@ tasks.register('alldoc', Javadoc){
     classpath = files(projects.collect { it.sourceSets.main.compileClasspath })
     destinationDir = layout.buildDirectory.dir("docs/javadoc").getOrNull().getAsFile()
 
-    if (JavaVersion.current().isJava9Compatible()) {
-        options.addBooleanOption('html5', true)
-    }
 
     configure(options) {
-        //showFromPrivate()
+        showFromPrivate()
+        options.addBooleanOption('html5', true)
         encoding = 'UTF-8'
         addBooleanOption 'Xdoclint:none', true
         // overview = new File( projectDir, 'src/javadoc/package.html' )
@@ -420,7 +430,45 @@ tasks.register('alldoc', Javadoc){
         bottom = "Copyright &copy; 2003-2026 <a href=\"http://key-project.org\">The KeY-Project</a>."
         use = true
         links += "https://docs.oracle.com/en/java/javase/21/docs/api/"
-        links += "https://www.antlr.org/api/Java/"
+        links += "https://www.javadoc.io/doc/org.slf4j/slf4j-api/2.0.17/"
+        links += "https://www.javadoc.io/doc/org.antlr/antlr4-runtime/4.13.2/"
+        links +="https://www.javadoc.io/doc/ch.qos.logback/logback-classic/1.5.32/"
+        links +="https://www.javadoc.io/doc/com.formdev/flatlaf/3.7/"
+        links +="https://www.javadoc.io/doc/com.miglayout/miglayout-swing/11.4.3/"
+        links +="https://www.javadoc.io/doc/com.squareup/javapoet/1.13.0/"
+        //links +="https://www.javadoc.io/doc/de.unruh/scala-isabelle_2.13/0.4.5/"
+        links +="https://www.javadoc.io/doc/info.picocli/picocli/4.7.7/"
+        links +="https://www.javadoc.io/doc/org.antlr/ST4/4.3.4/"
+        links +="https://www.javadoc.io/doc/org.antlr/antlr4-runtime/4.13.2/"
+        links +="https://www.javadoc.io/doc/org.jspecify/jspecify/1.0.0/"
+        links +="https://www.javadoc.io/doc/org.slf4j/slf4j-api/2.0.17/"
+
+        linkSource()
+        author()
+        version()
+
+        group("key.core.infflow", "de.uka.ilkd.key.informationflow")
+        group("key.core", "de.uka.ilkd.key")
+        group("key.util", "org.key_project.util")
+        group("key.ui", "org.key_project.util.java",
+                "de.uka.ilkd.key.core", "de.uka.ilkd.key.gui",
+                "de.uka.ilkd.key.proof", "de.uka.ilkd.key.ui","de.uka.ilkd.key.util")
+        group("key.core.wd", "de.uka.ilkd.key.wd")
+        group("key.core.testgen", "de.uka.ilkd.key.testgen")
+        group("key.ncore", "org.key_project.logic")
+        group("key.ncore.calculus", "org.key_project.prover")
+
+        /*
+        group("keyext.isabelletranslation", "org.key_project.isabelletranslation")
+        group("keyext.proofmanagement", "org.key_project.proofmanagement")
+        group("keyext.slicing", "org.key_project.slicing")
+        group("keyext.ui.testgen", "de.uka.ilkd.key.gui.testgen")
+        group("keyext.exploration","org.key_project.exploration")
+        group("keyext.caching", "de.uka.ilkd.key.gui.plugins.caching")
+        group("key.core.symbolic_execution",// "de.uka.ilkd.key.proof",
+                "de.uka.ilkd.key.rule.label", "de.uka.ilkd.key.strategy",
+                "de.uka.ilkd.key.symbolic_execution")
+        group("key.core.proof_references", "de.uka.ilkd.key.proof_references")*/
     }
 }
 
diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/TacletIndex.java b/key.core/src/main/java/de/uka/ilkd/key/proof/TacletIndex.java
@@ -7,9 +7,6 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import de.uka.ilkd.key.java.JavaProgramElement;
-import de.uka.ilkd.key.java.ProgramElement;
-import de.uka.ilkd.key.java.StatementBlock;
 import de.uka.ilkd.key.java.ast.JavaProgramElement;
 import de.uka.ilkd.key.java.ast.ProgramElement;
 import de.uka.ilkd.key.java.ast.StatementBlock;
