From b0164a4183906aa936885943dc43145694456fbd Mon Sep 17 00:00:00 2001 From: TUBB Date: Tue, 3 Sep 2019 16:20:06 +0800 Subject: [PATCH] refactor: deps --- app/build.gradle | 5 +--- .../fcrash/sample/ExampleInstrumentedTest.kt | 24 ----------------- .../tubb/fcrash/sample/ExampleUnitTest.kt | 17 ------------ friendlycrash/build.gradle | 22 ++++++++++------ .../tubb/fcrash/ExampleInstrumentedTest.java | 26 ------------------- .../github/tubb/fcrash/ExampleUnitTest.java | 17 ------------ 6 files changed, 15 insertions(+), 96 deletions(-) delete mode 100644 app/src/androidTest/java/io/github/tubb/fcrash/sample/ExampleInstrumentedTest.kt delete mode 100644 app/src/test/java/io/github/tubb/fcrash/sample/ExampleUnitTest.kt delete mode 100644 friendlycrash/src/androidTest/java/io/github/tubb/fcrash/ExampleInstrumentedTest.java delete mode 100644 friendlycrash/src/test/java/io/github/tubb/fcrash/ExampleUnitTest.java diff --git a/app/build.gradle b/app/build.gradle index 5753465..3ac7f95 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,10 +25,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':friendlycrash') - implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' } diff --git a/app/src/androidTest/java/io/github/tubb/fcrash/sample/ExampleInstrumentedTest.kt b/app/src/androidTest/java/io/github/tubb/fcrash/sample/ExampleInstrumentedTest.kt deleted file mode 100644 index fe6df40..0000000 --- a/app/src/androidTest/java/io/github/tubb/fcrash/sample/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package io.github.tubb.fcrash.sample - -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getTargetContext() - assertEquals("io.github.tubb.fcrash.sample", appContext.packageName) - } -} diff --git a/app/src/test/java/io/github/tubb/fcrash/sample/ExampleUnitTest.kt b/app/src/test/java/io/github/tubb/fcrash/sample/ExampleUnitTest.kt deleted file mode 100644 index fe6d601..0000000 --- a/app/src/test/java/io/github/tubb/fcrash/sample/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package io.github.tubb.fcrash.sample - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/friendlycrash/build.gradle b/friendlycrash/build.gradle index f5fe281..c3a4a30 100644 --- a/friendlycrash/build.gradle +++ b/friendlycrash/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 15 targetSdkVersion 28 - versionCode 102 - versionName "1.0.2" + versionCode 103 + versionName "1.0.3" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -25,14 +25,20 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "android.arch.lifecycle:extensions:1.1.1" + implementation("android.arch.lifecycle:extensions:1.1.1") { + exclude group: 'com.android.support', module: 'support-annotations' + exclude group: 'com.android.support', module: 'support-compat' + exclude group: 'com.android.support', module: 'support-fragment' + exclude group: 'com.android.support', module: 'support-core-ui' + exclude group: 'com.android.support', module: 'support-core-utils' + } annotationProcessor "android.arch.lifecycle:compiler:1.1.1" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } +Properties properties = new Properties() +properties.load(project.rootProject.file("local.properties").newDataInputStream()) + project.ext { mavDevelopers = ["TUBB":"BingBing Tu"] mavSiteUrl = "https://github.com/TUBB/FriendlyCrash" @@ -41,8 +47,8 @@ project.ext { mavLibraryLicenses = ["Apache-2.0":'http://www.apache.org/licenses/LICENSE-2.0.txt'] mavLibraryDescription = "Friendly notify user when app crashed if app moved to background" mavPublishToRemoteRepo = true - mavRemoteRepoUser = "TUBB" - mavRemoteRepoPassword = "2553441abc" + mavRemoteRepoUser = properties.getProperty("repo.username") + mavRemoteRepoPassword = properties.getProperty("repo.pwd") mavRepoRemoteUrl = "https://jitpack.io" } diff --git a/friendlycrash/src/androidTest/java/io/github/tubb/fcrash/ExampleInstrumentedTest.java b/friendlycrash/src/androidTest/java/io/github/tubb/fcrash/ExampleInstrumentedTest.java deleted file mode 100644 index e0c66a3..0000000 --- a/friendlycrash/src/androidTest/java/io/github/tubb/fcrash/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.github.tubb.fcrash; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("io.github.tubb.fcrash.test", appContext.getPackageName()); - } -} diff --git a/friendlycrash/src/test/java/io/github/tubb/fcrash/ExampleUnitTest.java b/friendlycrash/src/test/java/io/github/tubb/fcrash/ExampleUnitTest.java deleted file mode 100644 index 6935c2c..0000000 --- a/friendlycrash/src/test/java/io/github/tubb/fcrash/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.github.tubb.fcrash; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file