Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 14:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Upgrade Gradle and Android Gradle plugin

Browse Source
This commit is contained in:
akwizgran
2017-11-15 14:47:36 +00:00
parent 98e2adf794
commit 9f29bf4949
7 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bramble-android/build.gradle
View File

@@ -6,8 +6,8 @@ apply plugin: 'witness'
apply plugin: 'de.undercouch.download' apply plugin: 'de.undercouch.download'
android { android {
compileSdkVersion 23 compileSdkVersion 26
buildToolsVersion '25.0.0' buildToolsVersion '26.0.2'
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14

17
briar-android/build.gradle
View File

@@ -2,9 +2,11 @@ apply plugin: 'com.android.application'
apply plugin: 'witness' apply plugin: 'witness'
dependencies { dependencies {
def supportVersion = '23.2.1'
compile project(path: ':briar-core', configuration: 'default') compile project(path: ':briar-core', configuration: 'default')
compile project(path: ':bramble-core', configuration: 'default')
compile project(path: ':bramble-android', configuration: 'default') compile project(path: ':bramble-android', configuration: 'default')
def supportVersion = '23.2.1'
compile "com.android.support:support-v4:$supportVersion" compile "com.android.support:support-v4:$supportVersion"
compile("com.android.support:appcompat-v7:$supportVersion") { compile("com.android.support:appcompat-v7:$supportVersion") {
exclude module: 'support-v4' exclude module: 'support-v4'
@@ -22,6 +24,7 @@ dependencies {
exclude module: 'support-v4' exclude module: 'support-v4'
exclude module: 'support-annotations' exclude module: 'support-annotations'
} }
compile 'info.guardianproject.panic:panic:0.5' compile 'info.guardianproject.panic:panic:0.5'
compile 'info.guardianproject.trustedintents:trustedintents:0.2' compile 'info.guardianproject.trustedintents:trustedintents:0.2'
compile 'de.hdodenhof:circleimageview:2.1.0' compile 'de.hdodenhof:circleimageview:2.1.0'
@@ -35,7 +38,7 @@ dependencies {
provided 'javax.annotation:jsr250-api:1.0' provided 'javax.annotation:jsr250-api:1.0'
testCompile project(path: ':bramble-core', configuration: 'testOutput') testCompile project(path: ':bramble-core', configuration: 'testOutput')
testCompile 'org.robolectric:robolectric:3.0' testCompile 'org.robolectric:robolectric:3.5.1'
testCompile 'org.mockito:mockito-core:2.8.9' testCompile 'org.mockito:mockito-core:2.8.9'
} }
@@ -74,8 +77,8 @@ def getGitHash = { ->
} }
android { android {
compileSdkVersion 23 compileSdkVersion 26
buildToolsVersion '25.0.0' buildToolsVersion '26.0.2'
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
@@ -109,6 +112,12 @@ android {
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7
} }
testOptions {
unitTests {
includeAndroidResources = true
}
}
aaptOptions { aaptOptions {
cruncherEnabled = false cruncherEnabled = false
} }

12
briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java
View File

@@ -9,7 +9,6 @@ import org.briarproject.bramble.api.identity.Author;
import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.AuthorId;
import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.test.TestUtils;
import org.briarproject.briar.BuildConfig;
import org.briarproject.briar.android.TestBriarApplication; import org.briarproject.briar.android.TestBriarApplication;
import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler; import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler;
import org.briarproject.briar.android.threaded.ThreadItemAdapter; import org.briarproject.briar.android.threaded.ThreadItemAdapter;
@@ -22,7 +21,7 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Captor; import org.mockito.Captor;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import java.util.Arrays; import java.util.Arrays;
@@ -34,9 +33,8 @@ import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_K
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@RunWith(RobolectricGradleTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 21, @Config(sdk = 21, application = TestBriarApplication.class,
application = TestBriarApplication.class,
packageName = "org.briarproject.briar") packageName = "org.briarproject.briar")
public class ForumActivityTest { public class ForumActivityTest {
@@ -89,8 +87,8 @@ public class ForumActivityTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra("briar.GROUP_ID", TestUtils.getRandomId()); intent.putExtra("briar.GROUP_ID", TestUtils.getRandomId());
forumActivity = Robolectric.buildActivity(TestForumActivity.class) forumActivity = Robolectric.buildActivity(TestForumActivity.class,
.withIntent(intent).create().start().resume().get(); intent).create().start().resume().get();
} }
private ThreadItemList<ForumItem> getDummyData() { private ThreadItemList<ForumItem> getDummyData() {

8
briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordActivityTest.java
View File

@@ -6,7 +6,6 @@ import android.support.design.widget.TextInputLayout;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import org.briarproject.briar.BuildConfig;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.TestBriarApplication; import org.briarproject.briar.android.TestBriarApplication;
import org.briarproject.briar.android.controller.handler.ResultHandler; import org.briarproject.briar.android.controller.handler.ResultHandler;
@@ -20,7 +19,7 @@ import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
@@ -39,9 +38,8 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(RobolectricGradleTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 21, @Config(sdk = 21, application = TestBriarApplication.class,
application = TestBriarApplication.class,
packageName = "org.briarproject.briar") packageName = "org.briarproject.briar")
public class ChangePasswordActivityTest { public class ChangePasswordActivityTest {

8
briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java
View File

@@ -7,7 +7,6 @@ import android.support.design.widget.TextInputLayout;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import org.briarproject.briar.BuildConfig;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.TestBriarApplication; import org.briarproject.briar.android.TestBriarApplication;
import org.briarproject.briar.android.controller.handler.ResultHandler; import org.briarproject.briar.android.controller.handler.ResultHandler;
@@ -22,7 +21,7 @@ import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowActivity;
@@ -44,9 +43,8 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf; import static org.robolectric.Shadows.shadowOf;
@RunWith(RobolectricGradleTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 21, @Config(sdk = 21, application = TestBriarApplication.class,
application = TestBriarApplication.class,
packageName = "org.briarproject.briar") packageName = "org.briarproject.briar")
public class SetupActivityTest { public class SetupActivityTest {

3
build.gradle
View File

@@ -14,10 +14,11 @@ buildscript {
maven { maven {
url "https://plugins.gradle.org/m2/" url "https://plugins.gradle.org/m2/"
} }
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'net.ltgt.gradle:gradle-apt-plugin:0.9' classpath 'net.ltgt.gradle:gradle-apt-plugin:0.9'
classpath 'de.undercouch:gradle-download-task:3.2.0' classpath 'de.undercouch:gradle-download-task:3.2.0'
classpath files('libs/gradle-witness.jar') classpath files('libs/gradle-witness.jar')

5
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,7 +1,6 @@
#Wed Aug 24 10:55:42 BST 2016
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
distributionSha256Sum=d84bf6b6113da081d0082bcb63bd8547824c6967fe68704d1e3a6fde822b7212 distributionSha256Sum=c5b67330a8a211539d713852c56a6a80fdea365d8902df92d1759d913d18fa2d