Merge pull request #27 from cryptimeleon/develop

Version bump

.github/workflows/dev-ci.yaml

@@ -6,8 +6,8 @@ on:
       - main
       - 'release/**'
   # Nightly builds to ensure dependencies don't break anything
-  schedule:
-    - cron: '0 0 * * *'
+  #schedule:
+  #  - cron: '0 0 * * *'
 
 jobs:
   build:

.github/workflows/scheduled-release-ci.yaml → .github/workflows/main-ci.yaml

@@ -1,17 +1,19 @@
-name: Scheduled Release Java CI
+name: Main Java CI
 
 on:
+  push:
+    branches:
+      - main
+      - 'release/**'
   # Nightly builds to ensure dependencies don't break anything
-  schedule:
-    - cron: '0 0 * * *'
+  #schedule:
+  #  - cron: '0 0 * * *'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          ref: main
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:

.github/workflows/pub.yaml → .github/workflows/tagged_release.yaml

@@ -1,9 +1,7 @@
-name: Publishing
+name: Tagged release
 
 on:
   push:
-    branches:
-      - main
     tags:
       - v[1-9]+.[0-9]+.[0-9]+
 jobs:
@@ -27,6 +25,8 @@ jobs:
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
+          draft: false
           files: |
             LICENSE
             build/libs/*.jar
+        id: "automatic_releases"

CITATION.cff

@@ -0,0 +1,23 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://bit.ly/cffinit to generate yours today!
+
+cff-version: 1.2.0
+title: Cryptimeleon Craco
+message: >-
+  When writing research papers, please cite our paper https://eprint.iacr.org/2021/961.
+type: software
+authors:
+  - given-names: Jan
+    family-names: Bobolz
+  - given-names: Denis
+    family-names: Diemert
+  - given-names: Fabian
+    family-names: Eidens
+  - given-names: Raphael
+    family-names: Heitjohann
+  - given-names: Paul
+    family-names: Kramer
+  - name: "Open-Source Contributors"
+repository-code: 'https://github.com/cryptimeleon/predenc'
+url: 'https://cryptimeleon.org'
+license: Apache-2.0

README.md

@@ -1,6 +1,6 @@
 ![Build Status](https://github.com/cryptimeleon/predenc/workflows/Development%20Java%20CI/badge.svg)
-![Build Status](https://github.com/cryptimeleon/predenc/workflows/Release%20Java%20CI/badge.svg)
-![Build Status](https://github.com/cryptimeleon/predenc/workflows/Scheduled%20Release%20Java%20CI/badge.svg)
+![Build Status](https://github.com/cryptimeleon/predenc/workflows/Main%20Java%20CI/badge.svg)
+![Build Status](https://github.com/cryptimeleon/predenc/workflows/Scheduled%20Main%20Java%20CI/badge.svg)
 # Predenc
 
 The Cryptimeleon Predenc project contains various predicate encryption implementations such as attribute-based encryption or identity-based encryption.

build.gradle

@@ -7,7 +7,7 @@ plugins {
 group 'org.cryptimeleon'
 archivesBaseName = project.name
 boolean isRelease = project.hasProperty("release")
-version = '2.0.0'  + (isRelease ? "" : "-SNAPSHOT")
+version = '2.0.1'  + (isRelease ? "" : "-SNAPSHOT")
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8