From 4deb39b5decb6453c6cf00af366b5bcfed06a3db Mon Sep 17 00:00:00 2001 From: jiriletak Date: Tue, 22 Sep 2020 12:56:22 +0200 Subject: [PATCH] v0.1.0 clean project --- AndroidPromise/build.gradle | 10 +++------- AndroidPromise/src/main/AndroidManifest.xml | 2 +- .../ibbjile => }/androidPromise/ExceptionCallback.java | 2 +- .../java/{org/ibbjile => }/androidPromise/Promise.java | 2 +- .../ibbjile => }/androidPromise/PromiseCallback.java | 2 +- .../androidPromise/PromiseInPromiseCallback.java | 2 +- .../ibbjile => }/androidPromise/StartCallback.java | 2 +- .../androidPromise/StartCallbackWithoutPromise.java | 2 +- .../{org/ibbjile => }/androidPromise/ThenCallback.java | 2 +- .../androidPromise/ThenCallbackWithoutPromise.java | 2 +- .../{org/ibbjile => }/androidPromise/VoidCallback.java | 2 +- .../androidPromise/VoidCallbackWithoutPromise.java | 2 +- AndroidPromise/src/test/java/PromiseTest.java | 9 +++++---- 13 files changed, 19 insertions(+), 22 deletions(-) rename AndroidPromise/src/main/java/{org/ibbjile => }/androidPromise/ExceptionCallback.java (69%) rename AndroidPromise/src/main/java/{org/ibbjile => }/androidPromise/Promise.java (99%) rename AndroidPromise/src/main/java/{org/ibbjile => }/androidPromise/PromiseCallback.java (51%) rename AndroidPromise/src/main/java/{org/ibbjile => }/androidPromise/PromiseInPromiseCallback.java (79%) rename AndroidPromise/src/main/java/{org/ibbjile => }/androidPromise/StartCallback.java (76%) rename AndroidPromise/src/main/java/{org/ibbjile => }/androidPromise/StartCallbackWithoutPromise.java (75%) rename AndroidPromise/src/main/java/{org/ibbjile => }/androidPromise/ThenCallback.java (80%) rename AndroidPromise/src/main/java/{org/ibbjile => }/androidPromise/ThenCallbackWithoutPromise.java (75%) rename AndroidPromise/src/main/java/{org/ibbjile => }/androidPromise/VoidCallback.java (77%) rename AndroidPromise/src/main/java/{org/ibbjile => }/androidPromise/VoidCallbackWithoutPromise.java (72%) diff --git a/AndroidPromise/build.gradle b/AndroidPromise/build.gradle index 2b480a3..6400c94 100644 --- a/AndroidPromise/build.gradle +++ b/AndroidPromise/build.gradle @@ -8,7 +8,6 @@ android { targetSdkVersion 29 versionCode 1 versionName "0.1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } @@ -29,9 +28,6 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.appcompat:appcompat:1.1.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - -} \ No newline at end of file + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' +} diff --git a/AndroidPromise/src/main/AndroidManifest.xml b/AndroidPromise/src/main/AndroidManifest.xml index 1ea6ab6..fdca3d4 100644 --- a/AndroidPromise/src/main/AndroidManifest.xml +++ b/AndroidPromise/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="androidPromise"> / \ No newline at end of file diff --git a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/ExceptionCallback.java b/AndroidPromise/src/main/java/androidPromise/ExceptionCallback.java similarity index 69% rename from AndroidPromise/src/main/java/org/ibbjile/androidPromise/ExceptionCallback.java rename to AndroidPromise/src/main/java/androidPromise/ExceptionCallback.java index ff053e1..bae975d 100644 --- a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/ExceptionCallback.java +++ b/AndroidPromise/src/main/java/androidPromise/ExceptionCallback.java @@ -1,4 +1,4 @@ -package org.ibbjile.androidPromise; +package androidPromise; public interface ExceptionCallback { void fail(T e); diff --git a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/Promise.java b/AndroidPromise/src/main/java/androidPromise/Promise.java similarity index 99% rename from AndroidPromise/src/main/java/org/ibbjile/androidPromise/Promise.java rename to AndroidPromise/src/main/java/androidPromise/Promise.java index 9980e2e..e8580c6 100644 --- a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/Promise.java +++ b/AndroidPromise/src/main/java/androidPromise/Promise.java @@ -1,4 +1,4 @@ -package org.ibbjile.androidPromise; +package androidPromise; public class Promise { diff --git a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/PromiseCallback.java b/AndroidPromise/src/main/java/androidPromise/PromiseCallback.java similarity index 51% rename from AndroidPromise/src/main/java/org/ibbjile/androidPromise/PromiseCallback.java rename to AndroidPromise/src/main/java/androidPromise/PromiseCallback.java index 398b6e4..3e511c5 100644 --- a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/PromiseCallback.java +++ b/AndroidPromise/src/main/java/androidPromise/PromiseCallback.java @@ -1,4 +1,4 @@ -package org.ibbjile.androidPromise; +package androidPromise; public interface PromiseCallback { } diff --git a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/PromiseInPromiseCallback.java b/AndroidPromise/src/main/java/androidPromise/PromiseInPromiseCallback.java similarity index 79% rename from AndroidPromise/src/main/java/org/ibbjile/androidPromise/PromiseInPromiseCallback.java rename to AndroidPromise/src/main/java/androidPromise/PromiseInPromiseCallback.java index 4685886..50f12b2 100644 --- a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/PromiseInPromiseCallback.java +++ b/AndroidPromise/src/main/java/androidPromise/PromiseInPromiseCallback.java @@ -1,4 +1,4 @@ -package org.ibbjile.androidPromise; +package androidPromise; public interface PromiseInPromiseCallback extends PromiseCallback { Promise run(T_PREV result) throws Exception; diff --git a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/StartCallback.java b/AndroidPromise/src/main/java/androidPromise/StartCallback.java similarity index 76% rename from AndroidPromise/src/main/java/org/ibbjile/androidPromise/StartCallback.java rename to AndroidPromise/src/main/java/androidPromise/StartCallback.java index f0b82b5..2db080f 100644 --- a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/StartCallback.java +++ b/AndroidPromise/src/main/java/androidPromise/StartCallback.java @@ -1,4 +1,4 @@ -package org.ibbjile.androidPromise; +package androidPromise; public interface StartCallback extends PromiseCallback { void run(Promise promise) throws Exception; diff --git a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/StartCallbackWithoutPromise.java b/AndroidPromise/src/main/java/androidPromise/StartCallbackWithoutPromise.java similarity index 75% rename from AndroidPromise/src/main/java/org/ibbjile/androidPromise/StartCallbackWithoutPromise.java rename to AndroidPromise/src/main/java/androidPromise/StartCallbackWithoutPromise.java index d8bf839..9b06f13 100644 --- a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/StartCallbackWithoutPromise.java +++ b/AndroidPromise/src/main/java/androidPromise/StartCallbackWithoutPromise.java @@ -1,4 +1,4 @@ -package org.ibbjile.androidPromise; +package androidPromise; public interface StartCallbackWithoutPromise extends PromiseCallback { T run() throws Exception; diff --git a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/ThenCallback.java b/AndroidPromise/src/main/java/androidPromise/ThenCallback.java similarity index 80% rename from AndroidPromise/src/main/java/org/ibbjile/androidPromise/ThenCallback.java rename to AndroidPromise/src/main/java/androidPromise/ThenCallback.java index 0ad9d16..c92b7cf 100644 --- a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/ThenCallback.java +++ b/AndroidPromise/src/main/java/androidPromise/ThenCallback.java @@ -1,4 +1,4 @@ -package org.ibbjile.androidPromise; +package androidPromise; public interface ThenCallback extends PromiseCallback { void run(T_PREV result, Promise promise) throws Exception; diff --git a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/ThenCallbackWithoutPromise.java b/AndroidPromise/src/main/java/androidPromise/ThenCallbackWithoutPromise.java similarity index 75% rename from AndroidPromise/src/main/java/org/ibbjile/androidPromise/ThenCallbackWithoutPromise.java rename to AndroidPromise/src/main/java/androidPromise/ThenCallbackWithoutPromise.java index 119780b..a00c1c5 100644 --- a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/ThenCallbackWithoutPromise.java +++ b/AndroidPromise/src/main/java/androidPromise/ThenCallbackWithoutPromise.java @@ -1,4 +1,4 @@ -package org.ibbjile.androidPromise; +package androidPromise; public interface ThenCallbackWithoutPromise { T_NEW run(T_PREV result) throws Exception; diff --git a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/VoidCallback.java b/AndroidPromise/src/main/java/androidPromise/VoidCallback.java similarity index 77% rename from AndroidPromise/src/main/java/org/ibbjile/androidPromise/VoidCallback.java rename to AndroidPromise/src/main/java/androidPromise/VoidCallback.java index 69ccdd3..cd87af6 100644 --- a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/VoidCallback.java +++ b/AndroidPromise/src/main/java/androidPromise/VoidCallback.java @@ -1,4 +1,4 @@ -package org.ibbjile.androidPromise; +package androidPromise; public interface VoidCallback extends PromiseCallback{ void run(T result, Promise promise) throws Exception; diff --git a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/VoidCallbackWithoutPromise.java b/AndroidPromise/src/main/java/androidPromise/VoidCallbackWithoutPromise.java similarity index 72% rename from AndroidPromise/src/main/java/org/ibbjile/androidPromise/VoidCallbackWithoutPromise.java rename to AndroidPromise/src/main/java/androidPromise/VoidCallbackWithoutPromise.java index 7da8748..ce5e48b 100644 --- a/AndroidPromise/src/main/java/org/ibbjile/androidPromise/VoidCallbackWithoutPromise.java +++ b/AndroidPromise/src/main/java/androidPromise/VoidCallbackWithoutPromise.java @@ -1,4 +1,4 @@ -package org.ibbjile.androidPromise; +package androidPromise; public interface VoidCallbackWithoutPromise { void run(T result) throws Exception; diff --git a/AndroidPromise/src/test/java/PromiseTest.java b/AndroidPromise/src/test/java/PromiseTest.java index b633bf1..40d73d0 100644 --- a/AndroidPromise/src/test/java/PromiseTest.java +++ b/AndroidPromise/src/test/java/PromiseTest.java @@ -1,7 +1,3 @@ -import org.ibbjile.androidPromise.ExceptionCallback; -import org.ibbjile.androidPromise.Promise; -import org.ibbjile.androidPromise.ThenCallback; -import org.ibbjile.androidPromise.VoidCallback; import org.junit.Assert; import org.junit.Test; @@ -10,6 +6,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import androidPromise.ExceptionCallback; +import androidPromise.Promise; +import androidPromise.ThenCallback; +import androidPromise.VoidCallback; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue;