From 38c0f168db7bdfdc8b5c6bfb98e82825806dee5d Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Mon, 1 Mar 2021 22:25:17 -0800 Subject: [PATCH] Remove JCenter usages, fix import, and cleanup build.gradle file. --- build.gradle | 30 +++++++------------ graphenej/build.gradle | 10 +------ .../graphenej/NodeLatencyVerifierTest.java | 3 +- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index 39aee9b..331d20d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,28 +1,18 @@ -subprojects { - repositories { - mavenCentral() - } -} -allprojects { - repositories { - mavenCentral() - jcenter() - maven { - url "https://maven.google.com" - } - } -} + buildscript { repositories { - mavenCentral() - maven { - url 'https://maven.google.com/' - name 'Google' - } google() - jcenter() + mavenCentral() + maven { url 'https://plugins.gradle.org/m2/' } } dependencies { classpath 'com.android.tools.build:gradle:4.1.2' } } + +allprojects { + repositories { + mavenCentral() + maven { url 'https://plugins.gradle.org/m2/' } + } +} diff --git a/graphenej/build.gradle b/graphenej/build.gradle index 9a66ab2..e954fc3 100644 --- a/graphenej/build.gradle +++ b/graphenej/build.gradle @@ -10,17 +10,9 @@ android { versionName "0.6.0" vectorDrawables.useSupportLibrary = true } - buildTypes { - debug{} - preRelease{} - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } + defaultConfig { multiDexEnabled true - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } } diff --git a/graphenej/src/androidTest/java/cy/agorise/graphenej/NodeLatencyVerifierTest.java b/graphenej/src/androidTest/java/cy/agorise/graphenej/NodeLatencyVerifierTest.java index f8542b0..10f226b 100644 --- a/graphenej/src/androidTest/java/cy/agorise/graphenej/NodeLatencyVerifierTest.java +++ b/graphenej/src/androidTest/java/cy/agorise/graphenej/NodeLatencyVerifierTest.java @@ -1,8 +1,9 @@ package cy.agorise.graphenej; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith;