Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
briar
briar
Commits
f8425658
Commit
f8425658
authored
Nov 15, 2017
by
akwizgran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support Java 8 language features in Java modules.
parent
53c8cf09
Pipeline
#774
failed with stage
in 3 minutes
Changes
6
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
52 additions
and
11 deletions
+52
-11
bramble-api/build.gradle
bramble-api/build.gradle
+12
-2
bramble-core/build.gradle
bramble-core/build.gradle
+12
-2
bramble-j2se/build.gradle
bramble-j2se/build.gradle
+2
-2
briar-api/build.gradle
briar-api/build.gradle
+12
-2
briar-core/build.gradle
briar-core/build.gradle
+12
-2
settings.gradle
settings.gradle
+2
-1
No files found.
bramble-api/build.gradle
View file @
f8425658
apply
plugin:
'java'
sourceCompatibility
=
1.
6
targetCompatibility
=
1.
6
sourceCompatibility
=
1.
8
targetCompatibility
=
1.
8
apply
plugin:
'witness'
...
...
@@ -35,3 +35,13 @@ task jarTest(type: Jar, dependsOn: testClasses) {
artifacts
{
testOutput
jarTest
}
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
tasks
.
withType
(
JavaCompile
)
{
doFirst
{
def
home
=
System
.
env
.
JAVA_6_HOME
;
if
(
home
!=
null
&&
!
home
.
isEmpty
())
{
options
.
bootstrapClasspath
=
files
(
"${home}/jre/lib/rt.jar"
,
"${home}/jre/lib/jsse.jar"
)
}
}
}
bramble-core/build.gradle
View file @
f8425658
apply
plugin:
'java'
sourceCompatibility
=
1.
6
targetCompatibility
=
1.
6
sourceCompatibility
=
1.
8
targetCompatibility
=
1.
8
apply
plugin:
'net.ltgt.apt'
apply
plugin:
'idea'
...
...
@@ -38,3 +38,13 @@ task jarTest(type: Jar, dependsOn: testClasses) {
artifacts
{
testOutput
jarTest
}
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
tasks
.
withType
(
JavaCompile
)
{
doFirst
{
def
home
=
System
.
env
.
JAVA_6_HOME
;
if
(
home
!=
null
&&
!
home
.
isEmpty
())
{
options
.
bootstrapClasspath
=
files
(
"${home}/jre/lib/rt.jar"
,
"${home}/jre/lib/jsse.jar"
)
}
}
}
bramble-j2se/build.gradle
View file @
f8425658
apply
plugin:
'java'
sourceCompatibility
=
1.
7
targetCompatibility
=
1.
7
sourceCompatibility
=
1.
8
targetCompatibility
=
1.
8
apply
plugin:
'net.ltgt.apt'
apply
plugin:
'idea'
...
...
briar-api/build.gradle
View file @
f8425658
apply
plugin:
'java'
sourceCompatibility
=
1.
6
targetCompatibility
=
1.
6
sourceCompatibility
=
1.
8
targetCompatibility
=
1.
8
dependencies
{
compile
project
(
path:
':bramble-api'
,
configuration:
'default'
)
}
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
tasks
.
withType
(
JavaCompile
)
{
doFirst
{
def
home
=
System
.
env
.
JAVA_6_HOME
;
if
(
home
!=
null
&&
!
home
.
isEmpty
())
{
options
.
bootstrapClasspath
=
files
(
"${home}/jre/lib/rt.jar"
,
"${home}/jre/lib/jsse.jar"
)
}
}
}
briar-core/build.gradle
View file @
f8425658
apply
plugin:
'java'
sourceCompatibility
=
1.
6
targetCompatibility
=
1.
6
sourceCompatibility
=
1.
8
targetCompatibility
=
1.
8
apply
plugin:
'net.ltgt.apt'
apply
plugin:
'idea'
...
...
@@ -33,3 +33,13 @@ dependencyVerification {
'com.squareup.okio:okio:734269c3ebc5090e3b23566db558f421f0b4027277c79ad5d176b8ec168bb850'
,
]
}
// If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
tasks
.
withType
(
JavaCompile
)
{
doFirst
{
def
home
=
System
.
env
.
JAVA_6_HOME
;
if
(
home
!=
null
&&
!
home
.
isEmpty
())
{
options
.
bootstrapClasspath
=
files
(
"${home}/jre/lib/rt.jar"
,
"${home}/jre/lib/jsse.jar"
)
}
}
}
settings.gradle
View file @
f8425658
include
':bramble-api'
,
':bramble-android'
include
':bramble-api'
include
':bramble-core'
include
':bramble-android'
include
':bramble-j2se'
include
':briar-api'
include
':briar-core'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment