From d1212540a875d61d0454b667b71b1ab0c49cf1bc Mon Sep 17 00:00:00 2001 From: Donovan Preston Date: Tue, 27 Nov 2018 09:34:51 -0500 Subject: [PATCH] Rename package to org.mozilla.sendandroid per Rename package to org.mozilla.sendandroid per https://bugzilla.mozilla.org/show_bug.cgi?id=1494393#c10 --- android/app/build.gradle | 2 +- .../sendandroid/ExampleInstrumentedTest.kt | 24 ------------------- android/app/src/main/AndroidManifest.xml | 2 +- .../mozilla}/sendandroid/MainActivity.kt | 2 +- .../send/sendandroid/ExampleUnitTest.kt | 17 ------------- 5 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 android/app/src/androidTest/java/com/mozilla/send/sendandroid/ExampleInstrumentedTest.kt rename android/app/src/main/java/{com/mozilla/send => org/mozilla}/sendandroid/MainActivity.kt (99%) delete mode 100644 android/app/src/test/java/com/mozilla/send/sendandroid/ExampleUnitTest.kt diff --git a/android/app/build.gradle b/android/app/build.gradle index 4b15da97..23d15734 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'kotlin-android-extensions' android { compileSdkVersion 27 defaultConfig { - applicationId "com.mozilla.send.sendandroid" + applicationId "org.mozilla.sendandroid" minSdkVersion 26 targetSdkVersion 27 versionCode 1 diff --git a/android/app/src/androidTest/java/com/mozilla/send/sendandroid/ExampleInstrumentedTest.kt b/android/app/src/androidTest/java/com/mozilla/send/sendandroid/ExampleInstrumentedTest.kt deleted file mode 100644 index c4461978..00000000 --- a/android/app/src/androidTest/java/com/mozilla/send/sendandroid/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.mozilla.send.sendandroid - -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("com.mozilla.send.sendandroid", appContext.packageName) - } -} diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 786540c6..1448cf83 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.mozilla.sendandroid"> diff --git a/android/app/src/main/java/com/mozilla/send/sendandroid/MainActivity.kt b/android/app/src/main/java/org/mozilla/sendandroid/MainActivity.kt similarity index 99% rename from android/app/src/main/java/com/mozilla/send/sendandroid/MainActivity.kt rename to android/app/src/main/java/org/mozilla/sendandroid/MainActivity.kt index eae1054f..2b6901a4 100644 --- a/android/app/src/main/java/com/mozilla/send/sendandroid/MainActivity.kt +++ b/android/app/src/main/java/org/mozilla/sendandroid/MainActivity.kt @@ -1,4 +1,4 @@ -package com.mozilla.send.sendandroid +package org.mozilla.sendandroid import android.support.v7.app.AppCompatActivity diff --git a/android/app/src/test/java/com/mozilla/send/sendandroid/ExampleUnitTest.kt b/android/app/src/test/java/com/mozilla/send/sendandroid/ExampleUnitTest.kt deleted file mode 100644 index 8de39016..00000000 --- a/android/app/src/test/java/com/mozilla/send/sendandroid/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.mozilla.send.sendandroid - -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) - } -}