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
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Julian Dehm
briar
Commits
6691d216
Verified
Commit
6691d216
authored
Sep 26, 2018
by
akwizgran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade Gradle Android plugin and build tools.
parent
a384450c
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
84 additions
and
102 deletions
+84
-102
.idea/runConfigurations/All_tests_in_bramble_android.xml
.idea/runConfigurations/All_tests_in_bramble_android.xml
+0
-3
.idea/runConfigurations/All_tests_in_bramble_api.xml
.idea/runConfigurations/All_tests_in_bramble_api.xml
+0
-3
.idea/runConfigurations/All_tests_in_bramble_core.xml
.idea/runConfigurations/All_tests_in_bramble_core.xml
+0
-3
.idea/runConfigurations/All_tests_in_bramble_java.xml
.idea/runConfigurations/All_tests_in_bramble_java.xml
+0
-3
.idea/runConfigurations/All_tests_in_briar_android.xml
.idea/runConfigurations/All_tests_in_briar_android.xml
+0
-3
.idea/runConfigurations/All_tests_in_briar_core.xml
.idea/runConfigurations/All_tests_in_briar_core.xml
+0
-3
.idea/runConfigurations/H2_Performance_Test.xml
.idea/runConfigurations/H2_Performance_Test.xml
+0
-3
.idea/runConfigurations/HyperSQL_Performance_Test.xml
.idea/runConfigurations/HyperSQL_Performance_Test.xml
+0
-3
bramble-android/build.gradle
bramble-android/build.gradle
+1
-1
bramble-android/witness.gradle
bramble-android/witness.gradle
+41
-38
briar-android/witness.gradle
briar-android/witness.gradle
+41
-38
build.gradle
build.gradle
+1
-1
No files found.
.idea/runConfigurations/All_tests_in_bramble_android.xml
View file @
6691d216
<component
name=
"ProjectRunConfigurationManager"
>
<configuration
default=
"false"
name=
"All tests in bramble-android"
type=
"AndroidJUnit"
factoryName=
"Android JUnit"
>
<extension
name=
"coverage"
enabled=
"false"
merge=
"false"
sample_coverage=
"true"
runner=
"idea"
/>
<module
name=
"bramble-android"
/>
<option
name=
"ALTERNATIVE_JRE_PATH_ENABLED"
value=
"false"
/>
<option
name=
"ALTERNATIVE_JRE_PATH"
/>
...
...
@@ -11,12 +10,10 @@
<option
name=
"VM_PARAMETERS"
value=
"-ea"
/>
<option
name=
"PARAMETERS"
value=
""
/>
<option
name=
"WORKING_DIRECTORY"
value=
"file://$PROJECT_DIR$/bramble-android"
/>
<option
name=
"ENV_VARIABLES"
/>
<option
name=
"PASS_PARENT_ENVS"
value=
"true"
/>
<option
name=
"TEST_SEARCH_SCOPE"
>
<value
defaultName=
"singleModule"
/>
</option>
<envs
/>
<patterns
/>
<method
/>
</configuration>
...
...
.idea/runConfigurations/All_tests_in_bramble_api.xml
View file @
6691d216
<component
name=
"ProjectRunConfigurationManager"
>
<configuration
default=
"false"
name=
"All tests in bramble-api"
type=
"AndroidJUnit"
factoryName=
"Android JUnit"
>
<extension
name=
"coverage"
enabled=
"false"
merge=
"false"
sample_coverage=
"true"
runner=
"idea"
/>
<module
name=
"bramble-api"
/>
<option
name=
"ALTERNATIVE_JRE_PATH_ENABLED"
value=
"false"
/>
<option
name=
"ALTERNATIVE_JRE_PATH"
/>
...
...
@@ -11,12 +10,10 @@
<option
name=
"VM_PARAMETERS"
value=
"-ea"
/>
<option
name=
"PARAMETERS"
value=
""
/>
<option
name=
"WORKING_DIRECTORY"
value=
"file://$PROJECT_DIR$/bramble-api"
/>
<option
name=
"ENV_VARIABLES"
/>
<option
name=
"PASS_PARENT_ENVS"
value=
"true"
/>
<option
name=
"TEST_SEARCH_SCOPE"
>
<value
defaultName=
"singleModule"
/>
</option>
<envs
/>
<patterns
/>
<method
/>
</configuration>
...
...
.idea/runConfigurations/All_tests_in_bramble_core.xml
View file @
6691d216
<component
name=
"ProjectRunConfigurationManager"
>
<configuration
default=
"false"
name=
"All tests in bramble-core"
type=
"AndroidJUnit"
factoryName=
"Android JUnit"
>
<extension
name=
"coverage"
enabled=
"false"
merge=
"false"
sample_coverage=
"true"
runner=
"idea"
/>
<module
name=
"bramble-core"
/>
<option
name=
"ALTERNATIVE_JRE_PATH_ENABLED"
value=
"false"
/>
<option
name=
"ALTERNATIVE_JRE_PATH"
/>
...
...
@@ -11,12 +10,10 @@
<option
name=
"VM_PARAMETERS"
value=
"-ea"
/>
<option
name=
"PARAMETERS"
value=
""
/>
<option
name=
"WORKING_DIRECTORY"
value=
"file://$PROJECT_DIR$/bramble-core"
/>
<option
name=
"ENV_VARIABLES"
/>
<option
name=
"PASS_PARENT_ENVS"
value=
"true"
/>
<option
name=
"TEST_SEARCH_SCOPE"
>
<value
defaultName=
"singleModule"
/>
</option>
<envs
/>
<patterns
/>
<method
/>
</configuration>
...
...
.idea/runConfigurations/All_tests_in_bramble_java.xml
View file @
6691d216
<component
name=
"ProjectRunConfigurationManager"
>
<configuration
default=
"false"
name=
"All tests in bramble-java"
type=
"AndroidJUnit"
factoryName=
"Android JUnit"
>
<extension
name=
"coverage"
enabled=
"false"
merge=
"false"
sample_coverage=
"true"
runner=
"idea"
/>
<module
name=
"bramble-java"
/>
<option
name=
"ALTERNATIVE_JRE_PATH_ENABLED"
value=
"false"
/>
<option
name=
"ALTERNATIVE_JRE_PATH"
/>
...
...
@@ -11,12 +10,10 @@
<option
name=
"VM_PARAMETERS"
value=
"-ea -Djava.library.path=libs"
/>
<option
name=
"PARAMETERS"
value=
""
/>
<option
name=
"WORKING_DIRECTORY"
value=
"file://$PROJECT_DIR$/bramble-java"
/>
<option
name=
"ENV_VARIABLES"
/>
<option
name=
"PASS_PARENT_ENVS"
value=
"true"
/>
<option
name=
"TEST_SEARCH_SCOPE"
>
<value
defaultName=
"singleModule"
/>
</option>
<envs
/>
<patterns
/>
<method
/>
</configuration>
...
...
.idea/runConfigurations/All_tests_in_briar_android.xml
View file @
6691d216
<component
name=
"ProjectRunConfigurationManager"
>
<configuration
default=
"false"
name=
"All tests in briar-android"
type=
"AndroidJUnit"
factoryName=
"Android JUnit"
>
<extension
name=
"coverage"
enabled=
"false"
merge=
"false"
sample_coverage=
"true"
runner=
"idea"
/>
<module
name=
"briar-android"
/>
<option
name=
"ALTERNATIVE_JRE_PATH_ENABLED"
value=
"false"
/>
<option
name=
"ALTERNATIVE_JRE_PATH"
/>
...
...
@@ -11,12 +10,10 @@
<option
name=
"VM_PARAMETERS"
value=
"-ea"
/>
<option
name=
"PARAMETERS"
value=
""
/>
<option
name=
"WORKING_DIRECTORY"
value=
"file://$PROJECT_DIR$/briar-android"
/>
<option
name=
"ENV_VARIABLES"
/>
<option
name=
"PASS_PARENT_ENVS"
value=
"true"
/>
<option
name=
"TEST_SEARCH_SCOPE"
>
<value
defaultName=
"singleModule"
/>
</option>
<envs
/>
<patterns
/>
<method
/>
</configuration>
...
...
.idea/runConfigurations/All_tests_in_briar_core.xml
View file @
6691d216
<component
name=
"ProjectRunConfigurationManager"
>
<configuration
default=
"false"
name=
"All tests in briar-core"
type=
"AndroidJUnit"
factoryName=
"Android JUnit"
>
<extension
name=
"coverage"
enabled=
"false"
merge=
"false"
sample_coverage=
"true"
runner=
"idea"
/>
<module
name=
"briar-core"
/>
<option
name=
"ALTERNATIVE_JRE_PATH_ENABLED"
value=
"false"
/>
<option
name=
"ALTERNATIVE_JRE_PATH"
/>
...
...
@@ -11,12 +10,10 @@
<option
name=
"VM_PARAMETERS"
value=
"-ea"
/>
<option
name=
"PARAMETERS"
value=
""
/>
<option
name=
"WORKING_DIRECTORY"
value=
"file://$PROJECT_DIR$/briar-core"
/>
<option
name=
"ENV_VARIABLES"
/>
<option
name=
"PASS_PARENT_ENVS"
value=
"true"
/>
<option
name=
"TEST_SEARCH_SCOPE"
>
<value
defaultName=
"singleModule"
/>
</option>
<envs
/>
<patterns
/>
<method
/>
</configuration>
...
...
.idea/runConfigurations/H2_Performance_Test.xml
View file @
6691d216
<component
name=
"ProjectRunConfigurationManager"
>
<configuration
default=
"false"
name=
"H2 Performance Test"
type=
"AndroidJUnit"
factoryName=
"Android JUnit"
>
<extension
name=
"coverage"
enabled=
"false"
merge=
"false"
sample_coverage=
"true"
runner=
"idea"
/>
<module
name=
"bramble-core"
/>
<option
name=
"ALTERNATIVE_JRE_PATH_ENABLED"
value=
"false"
/>
<option
name=
"ALTERNATIVE_JRE_PATH"
/>
...
...
@@ -11,12 +10,10 @@
<option
name=
"VM_PARAMETERS"
value=
"-ea"
/>
<option
name=
"PARAMETERS"
value=
""
/>
<option
name=
"WORKING_DIRECTORY"
value=
""
/>
<option
name=
"ENV_VARIABLES"
/>
<option
name=
"PASS_PARENT_ENVS"
value=
"true"
/>
<option
name=
"TEST_SEARCH_SCOPE"
>
<value
defaultName=
"singleModule"
/>
</option>
<envs
/>
<patterns
/>
<method
/>
</configuration>
...
...
.idea/runConfigurations/HyperSQL_Performance_Test.xml
View file @
6691d216
<component
name=
"ProjectRunConfigurationManager"
>
<configuration
default=
"false"
name=
"HyperSQL Performance Test"
type=
"AndroidJUnit"
factoryName=
"Android JUnit"
>
<extension
name=
"coverage"
enabled=
"false"
merge=
"false"
sample_coverage=
"true"
runner=
"idea"
/>
<module
name=
"bramble-core"
/>
<option
name=
"ALTERNATIVE_JRE_PATH_ENABLED"
value=
"false"
/>
<option
name=
"ALTERNATIVE_JRE_PATH"
/>
...
...
@@ -11,12 +10,10 @@
<option
name=
"VM_PARAMETERS"
value=
"-ea"
/>
<option
name=
"PARAMETERS"
value=
""
/>
<option
name=
"WORKING_DIRECTORY"
value=
""
/>
<option
name=
"ENV_VARIABLES"
/>
<option
name=
"PASS_PARENT_ENVS"
value=
"true"
/>
<option
name=
"TEST_SEARCH_SCOPE"
>
<value
defaultName=
"singleModule"
/>
</option>
<envs
/>
<patterns
/>
<method
/>
</configuration>
...
...
bramble-android/build.gradle
View file @
6691d216
...
...
@@ -4,7 +4,7 @@ apply from: 'witness.gradle'
android
{
compileSdkVersion
27
buildToolsVersion
'2
7.0.3
'
buildToolsVersion
'2
8.0.2
'
defaultConfig
{
minSdkVersion
14
...
...
bramble-android/witness.gradle
View file @
6691d216
This diff is collapsed.
Click to expand it.
briar-android/witness.gradle
View file @
6691d216
This diff is collapsed.
Click to expand it.
build.gradle
View file @
6691d216
...
...
@@ -27,7 +27,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
1.3
'
classpath
'com.android.tools.build:gradle:3.
2.0
'
classpath
'net.ltgt.gradle:gradle-apt-plugin:0.9'
classpath
'ru.vyarus:gradle-animalsniffer-plugin:1.4.3'
classpath
files
(
'libs/gradle-witness.jar'
)
...
...
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