Skip to content

Commit

Permalink
Merge pull request #22 from cryptimeleon/fix-deps
Browse files Browse the repository at this point in the history
Improve dependency declaractions
  • Loading branch information
rheitjoh authored May 26, 2021
2 parents 11beaa8 + 9c454f0 commit 375a5fb
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 10 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/release-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
branches:
- main
- 'release/**'
# Nightly builds to ensure dependencies don't break anything
schedule:
- cron: '0 0 * * *'

jobs:
build:
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/scheduled-release-ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Scheduled Release Java CI

on:
# Nightly builds to ensure dependencies don't break anything
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:
java-version: 1.8
- name: Build with Gradle
run: ./gradlew build -PcheckoutIfCloned -Prelease
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +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)
# Predenc

The Cryptimeleon Predenc project contains various predicate encryption implementations such as attribute-based encryption or identity-based encryption.
Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
group 'org.cryptimeleon'
archivesBaseName = project.name
boolean isRelease = project.hasProperty("release")
version = '1.0.1' + (isRelease ? "" : "-SNAPSHOT")
version = '1.1.0' + (isRelease ? "" : "-SNAPSHOT")

sourceCompatibility = 1.8
targetCompatibility = 1.8
Expand All @@ -30,9 +30,7 @@ dependencies {
def cracoVersion = cracoVersionNoSuffix + (isRelease ? "" : "-SNAPSHOT")
def mathVersion = mathVersionNoSuffix + (isRelease ? "" : "-SNAPSHOT")

implementation group: 'org.cryptimeleon', name: 'craco', version: cracoVersion
implementation group: 'org.cryptimeleon', name: 'math', version: mathVersion

api group: 'org.cryptimeleon', name: 'craco', version: cracoVersion

// For using craco tests on the schemes
testImplementation(group: 'org.cryptimeleon', name: 'craco', version: cracoVersion) {
Expand Down Expand Up @@ -80,9 +78,11 @@ test {
task javadocLatex(type: Javadoc) {
source = sourceSets.main.allJava
classpath = sourceSets.main.runtimeClasspath
// link to math and craco javadocs
options {
links "https://javadoc.io/doc/org.cryptimeleon/math/" + mathVersionNoSuffix, "https://javadoc.io/doc/org.cryptimeleon/craco/" + cracoVersionNoSuffix
if (isRelease) {
// link to math and craco javadocs
options {
links "https://javadoc.io/doc/org.cryptimeleon/math/" + mathVersionNoSuffix, "https://javadoc.io/doc/org.cryptimeleon/craco/" + cracoVersionNoSuffix
}
}
// enable latex rendering via mathjax
options.addBooleanOption("-allow-script-in-comments", true)
Expand Down

0 comments on commit 375a5fb

Please sign in to comment.