Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
briar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
briar
Commits
bd616853
Commit
bd616853
authored
6 years ago
by
Torsten Grote
Browse files
Options
Downloads
Plain Diff
Merge branch '1607-upgrade-rome' into 'master'
Upgrade Rome to fix memory allocation bug Closes
#1607
See merge request
!1151
parents
6b022afa
32e1d6c7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1151
Upgrade Rome to fix memory allocation bug
Pipeline
#3643
passed
6 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
briar-core/build.gradle
+1
-1
1 addition, 1 deletion
briar-core/build.gradle
briar-core/witness.gradle
+2
-2
2 additions, 2 deletions
briar-core/witness.gradle
with
3 additions
and
3 deletions
briar-core/build.gradle
+
1
−
1
View file @
bd616853
...
@@ -10,7 +10,7 @@ apply from: '../dagger.gradle'
...
@@ -10,7 +10,7 @@ apply from: '../dagger.gradle'
dependencies
{
dependencies
{
implementation
project
(
path:
':briar-api'
,
configuration:
'default'
)
implementation
project
(
path:
':briar-api'
,
configuration:
'default'
)
implementation
'com.rometools:rome:1.1
0.0
'
implementation
'com.rometools:rome:1.1
2.1
'
implementation
'org.jdom:jdom2:2.0.6'
implementation
'org.jdom:jdom2:2.0.6'
implementation
'com.squareup.okhttp3:okhttp:3.12.2'
implementation
'com.squareup.okhttp3:okhttp:3.12.2'
implementation
'org.jsoup:jsoup:1.11.3'
implementation
'org.jsoup:jsoup:1.11.3'
...
...
This diff is collapsed.
Click to expand it.
briar-core/witness.gradle
+
2
−
2
View file @
bd616853
...
@@ -11,8 +11,8 @@ dependencyVerification {
...
@@ -11,8 +11,8 @@ dependencyVerification {
'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e'
,
'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e'
,
'com.google.guava:guava:25.0-jre:guava-25.0-jre.jar:3fd4341776428c7e0e5c18a7c10de129475b69ab9d30aeafbb5c277bb6074fa9'
,
'com.google.guava:guava:25.0-jre:guava-25.0-jre.jar:3fd4341776428c7e0e5c18a7c10de129475b69ab9d30aeafbb5c277bb6074fa9'
,
'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6'
,
'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6'
,
'com.rometools:rome-utils:1.1
0.0
:rome-utils-1.1
0.0
.jar:
5bcfe917fe90e89ae8e02fed543c3657a882565a6bc98197fc11905d88a2a501
'
,
'com.rometools:rome-utils:1.1
2.1
:rome-utils-1.1
2.1
.jar:
d65ce5f0926ee80e1ed19b176428846098000fc4db09360a1b4dd3a1a36ed477
'
,
'com.rometools:rome:1.1
0.0
:rome-1.1
0.0
.jar:
9ff5156d800f6c9ecbe7fca54daf756ac2720c41
eb92
40d2d66379700f1ecb8a
'
,
'com.rometools:rome:1.1
2.1
:rome-1.1
2.1
.jar:
13414d70a6c185e1374588321861c6e9
eb
7
92
8eee502d032094ef3ca0fd921ae
'
,
'com.squareup.okhttp3:okhttp:3.12.2:okhttp-3.12.2.jar:ada4af7d0d82d56a65947bfc8e1d39d1f22a9a7cc568fcbc48b41288891606ad'
,
'com.squareup.okhttp3:okhttp:3.12.2:okhttp-3.12.2.jar:ada4af7d0d82d56a65947bfc8e1d39d1f22a9a7cc568fcbc48b41288891606ad'
,
'com.squareup.okio:okio:1.15.0:okio-1.15.0.jar:693fa319a7e8843300602b204023b7674f106ebcb577f2dd5807212b66118bd2'
,
'com.squareup.okio:okio:1.15.0:okio-1.15.0.jar:693fa319a7e8843300602b204023b7674f106ebcb577f2dd5807212b66118bd2'
,
'com.squareup:javapoet:1.11.1:javapoet-1.11.1.jar:9cbf2107be499ec6e95afd36b58e3ca122a24166cdd375732e51267d64058e90'
,
'com.squareup:javapoet:1.11.1:javapoet-1.11.1.jar:9cbf2107be499ec6e95afd36b58e3ca122a24166cdd375732e51267d64058e90'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment