Skip to content

Commit cc4c67b

Browse files
committed
fix to mls build
1 parent 26cf352 commit cc4c67b

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed

mls/build.gradle

+19-16
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,30 @@ plugins {
33
// OSGI
44
id "biz.aQute.bnd.builder" version "7.0.0"
55
// Provide convenience executables for trying out the examples.
6-
// id 'application'
6+
id 'application'
77
id 'com.google.protobuf' version '0.9.4'
88
// Generate IntelliJ IDEA's .idea & .iml project files
99
// id 'idea'
1010
}
1111

12-
//apply plugin: 'java'
13-
//apply plugin: 'com.google.protobuf'
12+
apply plugin: 'java'
13+
apply plugin: 'com.google.protobuf'
14+
15+
sourceSets {
16+
17+
main {
18+
java {
19+
srcDirs 'build/generated/source/proto/main/grpc'
20+
srcDirs 'build/generated/source/proto/main/java'
21+
}
22+
}
23+
24+
java9 {
25+
java {
26+
srcDirs = ['src/main/jdk1.9']
27+
}
28+
}
29+
}
1430

1531
dependencies {
1632
implementation project(':core')
@@ -102,19 +118,6 @@ protobuf {
102118

103119
jar.archiveBaseName = "bcmls-$vmrange"
104120

105-
sourceSets {
106-
main {
107-
java {
108-
srcDirs 'build/generated/source/proto/main/grpc'
109-
srcDirs 'build/generated/source/proto/main/java'
110-
}
111-
}
112-
java9 {
113-
java {
114-
srcDirs = ['src/main/jdk1.9']
115-
}
116-
}
117-
}
118121

119122
startScripts.enabled = false
120123

mls/src/main/jdk1.9/module-info.java

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
module org.bouncycastle.mls
22
{
3-
provides java.security.Provider with org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
4-
53
requires java.logging;
64
requires org.bouncycastle.provider;
75
requires org.bouncycastle.util;

settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ include "pkix"
55
include "prov"
66
include "tls"
77
include "test"
8-
//include "mls"
8+
include "mls"
99
include "mail"
1010
include "jmail"

0 commit comments

Comments
 (0)