From 533249b40844b7af695d871d91264c000d5061a8 Mon Sep 17 00:00:00 2001 From: Parthipan Ramesh Date: Thu, 7 Jun 2018 11:45:34 +0200 Subject: [PATCH 1/2] Remove unused variables and unused design library Dexterous doesn't depend on the design support library. It doesn't jUnit, mockito or hamcrest either. --- build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/build.gradle b/build.gradle index 868c794..227347f 100644 --- a/build.gradle +++ b/build.gradle @@ -66,15 +66,7 @@ android { } } -ext { - supportLibVersion = '25.3.1' - junitVersion = '4.12' - mockitoVersion = '1.10.19' - hamcrestVersion = '1.3' -} - dependencies { - implementation "com.android.support:design:$supportLibVersion" api 'co.trikita:log:1.1.5' api group: 'commons-io', name: 'commons-io', version: '2.5' implementation group: 'commons-cli', name: 'commons-cli', version: '1.4' From 3ae3612502a70945f27ecd5cfe947c47950df6ca Mon Sep 17 00:00:00 2001 From: Parthipan Ramesh Date: Thu, 7 Jun 2018 11:47:38 +0200 Subject: [PATCH 2/2] Make trikita.log invisible to ARTistGUI (use LogA) The methods in LogA respect the set log level and ARTistGui should depend only on LogA. It shouldn't be able to call anything directly from trikita.log. --- build.gradle | 5 +++-- src/main/java/saarland/cispa/utils/LogA.java | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 227347f..81ec543 100644 --- a/build.gradle +++ b/build.gradle @@ -67,9 +67,10 @@ android { } dependencies { - api 'co.trikita:log:1.1.5' - api group: 'commons-io', name: 'commons-io', version: '2.5' + implementation 'co.trikita:log:1.1.5' implementation group: 'commons-cli', name: 'commons-cli', version: '1.4' + + api group: 'commons-io', name: 'commons-io', version: '2.5' api 'com.madgag.spongycastle:core:1.54.0.0' api 'com.madgag.spongycastle:prov:1.54.0.0' api 'com.madgag.spongycastle:pkix:1.54.0.0' diff --git a/src/main/java/saarland/cispa/utils/LogA.java b/src/main/java/saarland/cispa/utils/LogA.java index 5f70d84..2c2ac43 100644 --- a/src/main/java/saarland/cispa/utils/LogA.java +++ b/src/main/java/saarland/cispa/utils/LogA.java @@ -1,4 +1,4 @@ -/** +/* * The ARTist Project (https://artist.cispa.saarland) * * Copyright (C) 2017 CISPA (https://cispa.saarland), Saarland University @@ -19,6 +19,7 @@ * @author "Sebastian Weisgerber " * */ + package saarland.cispa.utils; import android.content.Context; @@ -27,8 +28,6 @@ import trikita.log.Log; -// TODO most of this code is duplicated in ArtistGui AND Dexterous. Refactor! - // Filtering logs before publishing them to logcat. public class LogA {