Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
695
Issues
695
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
briar
briar
Commits
efd9976a
Unverified
Commit
efd9976a
authored
Apr 27, 2016
by
akwizgran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgraded Gradle to 2.10, Android plugin to 2.1.0.
parent
4464a664
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
13 deletions
+19
-13
briar-android-tests/build.gradle
briar-android-tests/build.gradle
+7
-3
briar-android/build.gradle
briar-android/build.gradle
+8
-6
briar.iml
briar.iml
+1
-1
build.gradle
build.gradle
+1
-1
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+2
-2
No files found.
briar-android-tests/build.gradle
View file @
efd9976a
apply
plugin:
'com.android.library'
sourceCompatibility
=
1.7
targetCompatibility
=
1.7
apply
plugin:
'witness'
apply
plugin:
'com.neenbedankt.android-apt'
...
...
@@ -24,6 +22,13 @@ android {
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.pro'
}
}
dexOptions
{
incremental
true
}
compileOptions
{
sourceCompatibility
JavaVersion
.
VERSION_1_7
targetCompatibility
JavaVersion
.
VERSION_1_7
}
}
dependencies
{
...
...
@@ -46,5 +51,4 @@ dependencyVerification {
'com.android.support:support-v4:992666398b80724a2f95ea3d7bf7c3d94fb810dcba7ae1aa6e38c0d6120d2603'
,
'com.android.support:support-annotations:7f21659b084da073b77b6f7fe7ab250c4f23346238d4efdbbbb937e017ae4693'
,
]
}
briar-android/build.gradle
View file @
efd9976a
...
...
@@ -11,7 +11,6 @@ repositories {
}
dependencies
{
def
supportVersion
=
'23.1.1'
compile
project
(
':briar-api'
)
compile
project
(
':briar-core'
)
...
...
@@ -35,14 +34,14 @@ dependencies {
exclude
module:
'support-v4'
exclude
module:
'recyclerview-v7'
}
compile
(
"ch.acra:acra:4.8.5"
)
{
compile
(
'ch.acra:acra:4.8.5'
)
{
exclude
module:
'support-v4'
exclude
module:
'support-annotations'
}
compile
"info.guardianproject.panic:panic:0.5"
compile
"info.guardianproject.trustedintents:trustedintents:0.2"
compile
"de.hdodenhof:circleimageview:2.0.0"
compile
"com.google.zxing:core:3.2.1"
compile
'info.guardianproject.panic:panic:0.5'
compile
'info.guardianproject.trustedintents:trustedintents:0.2'
compile
'de.hdodenhof:circleimageview:2.0.0'
compile
'com.google.zxing:core:3.2.1'
apt
'com.google.dagger:dagger-compiler:2.0.2'
provided
'javax.annotation:jsr250-api:1.0'
}
...
...
@@ -111,6 +110,9 @@ android {
lintOptions
{
abortOnError
false
}
dexOptions
{
incremental
true
}
}
task
downloadTorGeoIp
(
type:
Download
)
{
...
...
briar.iml
View file @
efd9976a
...
...
@@ -8,7 +8,7 @@
</configuration>
</facet>
</component>
<component
name=
"NewModuleRootManager"
LANGUAGE_LEVEL=
"JDK_1_
6
"
inherit-compiler-output=
"true"
>
<component
name=
"NewModuleRootManager"
LANGUAGE_LEVEL=
"JDK_1_
7
"
inherit-compiler-output=
"true"
>
<exclude-output
/>
<content
url=
"file://$MODULE_DIR$"
>
<excludeFolder
url=
"file://$MODULE_DIR$/.gradle"
/>
...
...
build.gradle
View file @
efd9976a
...
...
@@ -9,7 +9,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:
1.5
.0'
classpath
'com.android.tools.build:gradle:
2.1
.0'
classpath
'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath
'de.undercouch:gradle-download-task:2.1.0'
classpath
files
(
'briar-core/libs/gradle-witness.jar'
)
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
efd9976a
#
Thu Dec 03 11:56:13 GMT 2015
#
Wed Apr 27 17:31:51 BST 2016
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-2.
9-bin
.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-2.
10-all
.zip
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