From 7410511c9d9ebc685bd3c9ca7528bff8f4916cdb Mon Sep 17 00:00:00 2001 From: drakeet Date: Tue, 3 Jul 2018 20:56:19 +0800 Subject: [PATCH] Updated code styles --- build.gradle | 26 +- checkstyle.xml | 79 +----- gradle.properties | 4 - library/build.gradle | 28 +- library/checkstyle.gradle | 21 +- library/gradle-mvn-push.gradle | 168 ++++++------ .../support/toast/BadTokenListener.java | 2 +- .../support/toast/SafeToastContext.java | 120 ++++----- .../me/drakeet/support/toast/ToastCompat.java | 240 +++++++++--------- .../me/drakeet/toast/ExampleUnitTest.java | 17 -- sample/build.gradle | 52 ++-- .../toast/sample/MainActivityTest.java | 16 +- .../me/drakeet/toast/sample/MainActivity.java | 18 +- .../me/drakeet/toast/ExampleUnitTest.java | 17 -- settings.gradle | 1 - 15 files changed, 354 insertions(+), 455 deletions(-) delete mode 100644 library/src/test/java/me/drakeet/toast/ExampleUnitTest.java delete mode 100644 sample/src/test/java/me/drakeet/toast/ExampleUnitTest.java diff --git a/build.gradle b/build.gradle index 3cb7099..8f417df 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,21 @@ buildscript { - - repositories { - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.1.1' - } + + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.1.1' + } } allprojects { - repositories { - google() - jcenter() - } + repositories { + google() + jcenter() + } } task clean(type: Delete) { - delete rootProject.buildDir + delete rootProject.buildDir } diff --git a/checkstyle.xml b/checkstyle.xml index e32fbf1..dcb77bd 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -2,65 +2,38 @@ - - - - - - - - - - - - - - - - - - - - + - - - + - - - @@ -68,11 +41,8 @@ - - - @@ -83,59 +53,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -146,6 +86,5 @@ - \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index aac7c9b..743d692 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,12 @@ # Project-wide Gradle settings. - # IDE (e.g. Android Studio) users: # Gradle settings configured through the IDE *will override* # any settings specified in this file. - # For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html - # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx1536m - # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/library/build.gradle b/library/build.gradle index 8f0f520..7d4e115 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -5,23 +5,23 @@ apply from: 'checkstyle.gradle' android { - compileSdkVersion gradle.compileSdkVersion - buildToolsVersion gradle.buildToolsVersion + compileSdkVersion gradle.compileSdkVersion - defaultConfig { - minSdkVersion gradle.minSdkVersion - targetSdkVersion gradle.targetSdkVersion - versionCode gradle.versionCode - versionName gradle.versionName - } - buildTypes { - release { - minifyEnabled false - } + defaultConfig { + minSdkVersion gradle.minSdkVersion + targetSdkVersion gradle.targetSdkVersion + versionCode gradle.versionCode + versionName gradle.versionName + } + + buildTypes { + release { + minifyEnabled false } + } } dependencies { - testImplementation 'junit:junit:4.12' - implementation 'com.android.support:support-annotations:' + gradle.supportLibraryVersion + testImplementation 'junit:junit:4.12' + implementation 'com.android.support:support-annotations:' + gradle.supportLibraryVersion } diff --git a/library/checkstyle.gradle b/library/checkstyle.gradle index 63218ae..ec1c5a1 100644 --- a/library/checkstyle.gradle +++ b/library/checkstyle.gradle @@ -16,20 +16,19 @@ apply plugin: 'checkstyle' checkstyle { - toolVersion = 8.2 + toolVersion = 8.2 } task checkStyle(type: Checkstyle) { - description = 'Runs checkStyle inspection against ToastCompat sourcesets.' - group = 'Code Style' - configFile = rootProject.file('checkstyle.xml') - ignoreFailures = false - showViolations = true - classpath = files() - source = 'src/main/java' + description = 'Runs checkStyle inspection against ToastCompat sourcesets.' + group = 'Code Style' + configFile = rootProject.file('checkstyle.xml') + ignoreFailures = false + showViolations = true + classpath = files() + source = 'src/main/java' } // check code style after project evaluation -afterEvaluate { project -> - getTasksByName('checkStyle', false)[0].execute() -} \ No newline at end of file +afterEvaluate { project -> getTasksByName('checkStyle', false)[0].execute() +} diff --git a/library/gradle-mvn-push.gradle b/library/gradle-mvn-push.gradle index 978d472..eac24c3 100644 --- a/library/gradle-mvn-push.gradle +++ b/library/gradle-mvn-push.gradle @@ -19,110 +19,108 @@ apply plugin: 'maven' apply plugin: 'signing' def isReleaseBuild() { - return gradle.versionName.contains("SNAPSHOT") == false + return gradle.versionName.contains("SNAPSHOT") == false } def getReleaseRepositoryUrl() { - return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL : - "https://oss.sonatype.org/service/local/staging/deploy/maven2/" + return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL : "https://oss.sonatype.org/service/local/staging/deploy/maven2/" } def getSnapshotRepositoryUrl() { - return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL : - "https://oss.sonatype.org/content/repositories/snapshots/" + return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL : "https://oss.sonatype.org/content/repositories/snapshots/" } def getRepositoryUsername() { - return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "" + return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "" } def getRepositoryPassword() { - return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "" + return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "" } afterEvaluate { project -> - uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - pom.groupId = GROUP - pom.artifactId = POM_ARTIFACT_ID - pom.version = gradle.versionName - - repository(url: getReleaseRepositoryUrl()) { - authentication(userName: getRepositoryUsername(), - password: getRepositoryPassword()) - } - snapshotRepository(url: getSnapshotRepositoryUrl()) { - authentication(userName: getRepositoryUsername(), - password: getRepositoryPassword()) - } - - pom.project { - name POM_NAME - packaging POM_PACKAGING - description POM_DESCRIPTION - url POM_URL - - scm { - url POM_SCM_URL - connection POM_SCM_CONNECTION - developerConnection POM_SCM_DEV_CONNECTION - } - - licenses { - license { - name POM_LICENCE_NAME - url POM_LICENCE_URL - distribution POM_LICENCE_DIST - } - } - - developers { - developer { - id POM_DEVELOPER_ID - name POM_DEVELOPER_NAME - } - } - } - } + uploadArchives { + repositories { + mavenDeployer { + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + + pom.groupId = GROUP + pom.artifactId = POM_ARTIFACT_ID + pom.version = gradle.versionName + + repository(url: getReleaseRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), + password: getRepositoryPassword()) } - } - - signing { - required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } - sign configurations.archives - } - - android.libraryVariants.all { variant -> - task("${variant.name}Javadoc", type: Javadoc) { - description "Generates Javadoc for $variant.name." - source = variant.javaCompile.source - classpath = files(variant.javaCompile.classpath.files, - project.android.getBootClasspath()) - exclude '**/BuildConfig.java' - exclude '**/R.java' + snapshotRepository(url: getSnapshotRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), + password: getRepositoryPassword()) } - } - task androidJavadocs(type: Javadoc) { - source = 'src/main/java,src/main/aidl' - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - } - - task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { - classifier = 'javadoc' - from androidJavadocs.destinationDir - } + pom.project { + name POM_NAME + packaging POM_PACKAGING + description POM_DESCRIPTION + url POM_URL + + scm { + url POM_SCM_URL + connection POM_SCM_CONNECTION + developerConnection POM_SCM_DEV_CONNECTION + } + + licenses { + license { + name POM_LICENCE_NAME + url POM_LICENCE_URL + distribution POM_LICENCE_DIST + } + } - task androidSourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.sourceFiles + developers { + developer { + id POM_DEVELOPER_ID + name POM_DEVELOPER_NAME + } + } + } + } } - - artifacts { - archives androidSourcesJar - archives androidJavadocsJar + } + + signing { + required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } + sign configurations.archives + } + + android.libraryVariants.all { variant -> + task("${variant.name}Javadoc", type: Javadoc) { + description "Generates Javadoc for $variant.name." + source = variant.javaCompile.source + classpath = files(variant.javaCompile.classpath.files, + project.android.getBootClasspath()) + exclude '**/BuildConfig.java' + exclude '**/R.java' } + } + + task androidJavadocs(type: Javadoc) { + source = 'src/main/java,src/main/aidl' + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + } + + task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { + classifier = 'javadoc' + from androidJavadocs.destinationDir + } + + task androidSourcesJar(type: Jar) { + classifier = 'sources' + from android.sourceSets.main.java.sourceFiles + } + + artifacts { + archives androidSourcesJar + archives androidJavadocsJar + } } diff --git a/library/src/main/java/me/drakeet/support/toast/BadTokenListener.java b/library/src/main/java/me/drakeet/support/toast/BadTokenListener.java index 3230418..9a2bf9d 100644 --- a/library/src/main/java/me/drakeet/support/toast/BadTokenListener.java +++ b/library/src/main/java/me/drakeet/support/toast/BadTokenListener.java @@ -8,5 +8,5 @@ */ public interface BadTokenListener { - void onBadTokenCaught(@NonNull Toast toast); + void onBadTokenCaught(@NonNull Toast toast); } diff --git a/library/src/main/java/me/drakeet/support/toast/SafeToastContext.java b/library/src/main/java/me/drakeet/support/toast/SafeToastContext.java index c446ede..0c37f65 100644 --- a/library/src/main/java/me/drakeet/support/toast/SafeToastContext.java +++ b/library/src/main/java/me/drakeet/support/toast/SafeToastContext.java @@ -16,94 +16,94 @@ */ final class SafeToastContext extends ContextWrapper { - private @NonNull Toast toast; + private @NonNull Toast toast; - private @Nullable BadTokenListener badTokenListener; + private @Nullable BadTokenListener badTokenListener; - SafeToastContext(@NonNull Context base, @NonNull Toast toast) { - super(base); - this.toast = toast; - } + SafeToastContext(@NonNull Context base, @NonNull Toast toast) { + super(base); + this.toast = toast; + } - @Override - public Context getApplicationContext() { - return new ApplicationContextWrapper(getBaseContext().getApplicationContext()); - } + @Override + public Context getApplicationContext() { + return new ApplicationContextWrapper(getBaseContext().getApplicationContext()); + } - public void setBadTokenListener(@NonNull BadTokenListener badTokenListener) { - this.badTokenListener = badTokenListener; - } + public void setBadTokenListener(@NonNull BadTokenListener badTokenListener) { + this.badTokenListener = badTokenListener; + } - private final class ApplicationContextWrapper extends ContextWrapper { + private final class ApplicationContextWrapper extends ContextWrapper { - private ApplicationContextWrapper(@NonNull Context base) { - super(base); - } + private ApplicationContextWrapper(@NonNull Context base) { + super(base); + } - @Override - public Object getSystemService(@NonNull String name) { - if (Context.WINDOW_SERVICE.equals(name)) { - // noinspection ConstantConditions - return new WindowManagerWrapper((WindowManager) getBaseContext().getSystemService(name)); - } - return super.getSystemService(name); - } + @Override + public Object getSystemService(@NonNull String name) { + if (Context.WINDOW_SERVICE.equals(name)) { + // noinspection ConstantConditions + return new WindowManagerWrapper((WindowManager) getBaseContext().getSystemService(name)); + } + return super.getSystemService(name); } + } - private final class WindowManagerWrapper implements WindowManager { + private final class WindowManagerWrapper implements WindowManager { - private static final String TAG = "WindowManagerWrapper"; - private final @NonNull WindowManager base; + private static final String TAG = "WindowManagerWrapper"; + private final @NonNull WindowManager base; - private WindowManagerWrapper(@NonNull WindowManager base) { - this.base = base; - } + private WindowManagerWrapper(@NonNull WindowManager base) { + this.base = base; + } - @Override - public Display getDefaultDisplay() { - return base.getDefaultDisplay(); - } + @Override + public Display getDefaultDisplay() { + return base.getDefaultDisplay(); + } - @Override - public void removeViewImmediate(View view) { - base.removeViewImmediate(view); - } + @Override + public void removeViewImmediate(View view) { + base.removeViewImmediate(view); + } - @Override - public void addView(View view, ViewGroup.LayoutParams params) { - try { - Log.d(TAG, "WindowManager's addView(view, params) has been hooked."); - base.addView(view, params); - } catch (BadTokenException e) { - Log.i(TAG, e.getMessage()); - if (badTokenListener != null) { - badTokenListener.onBadTokenCaught(toast); - } - } catch (Throwable throwable) { - Log.e(TAG, "[addView]", throwable); - } + @Override + public void addView(View view, ViewGroup.LayoutParams params) { + try { + Log.d(TAG, "WindowManager's addView(view, params) has been hooked."); + base.addView(view, params); + } catch (BadTokenException e) { + Log.i(TAG, e.getMessage()); + if (badTokenListener != null) { + badTokenListener.onBadTokenCaught(toast); } + } catch (Throwable throwable) { + Log.e(TAG, "[addView]", throwable); + } + } - @Override - public void updateViewLayout(View view, ViewGroup.LayoutParams params) { - base.updateViewLayout(view, params); - } + @Override + public void updateViewLayout(View view, ViewGroup.LayoutParams params) { + base.updateViewLayout(view, params); + } - @Override - public void removeView(View view) { - base.removeView(view); - } + @Override + public void removeView(View view) { + base.removeView(view); } + } } diff --git a/library/src/main/java/me/drakeet/support/toast/ToastCompat.java b/library/src/main/java/me/drakeet/support/toast/ToastCompat.java index 80d3376..61115f2 100644 --- a/library/src/main/java/me/drakeet/support/toast/ToastCompat.java +++ b/library/src/main/java/me/drakeet/support/toast/ToastCompat.java @@ -16,161 +16,161 @@ */ public final class ToastCompat extends Toast { - private final @NonNull Toast toast; - - - /** - * Construct an empty Toast object. You must call {@link #setView} before you - * can call {@link #show}. - * - * @param context The context to use. Usually your {@link Application} - * or {@link Activity} object. - * @param base The base toast - */ - private ToastCompat(Context context, @NonNull Toast base) { - super(context); - this.toast = base; - } + private final @NonNull Toast toast; + + + /** + * Construct an empty Toast object. You must call {@link #setView} before you + * can call {@link #show}. + * + * @param context The context to use. Usually your {@link Application} + * or {@link Activity} object. + * @param base The base toast + */ + private ToastCompat(Context context, @NonNull Toast base) { + super(context); + this.toast = base; + } + + + /** + * Make a standard toast that just contains a text view. + * + * @param context The context to use. Usually your {@link android.app.Application} + * or {@link android.app.Activity} object. + * @param text The text to show. Can be formatted text. + * @param duration How long to display the message. Either {@link #LENGTH_SHORT} or + * {@link #LENGTH_LONG} + */ + public static ToastCompat makeText(Context context, CharSequence text, int duration) { + // We cannot pass the SafeToastContext to Toast.makeText() because + // the View will unwrap the base context and we are in vain. + @SuppressLint("ShowToast") + Toast toast = Toast.makeText(context, text, duration); + setContext(toast.getView(), new SafeToastContext(context, toast)); + return new ToastCompat(context, toast); + } - /** - * Make a standard toast that just contains a text view. - * - * @param context The context to use. Usually your {@link android.app.Application} - * or {@link android.app.Activity} object. - * @param text The text to show. Can be formatted text. - * @param duration How long to display the message. Either {@link #LENGTH_SHORT} or - * {@link #LENGTH_LONG} - */ - public static ToastCompat makeText(Context context, CharSequence text, int duration) { - // We cannot pass the SafeToastContext to Toast.makeText() because - // the View will unwrap the base context and we are in vain. - @SuppressLint("ShowToast") - Toast toast = Toast.makeText(context, text, duration); - setContext(toast.getView(), new SafeToastContext(context, toast)); - return new ToastCompat(context, toast); - } + /** + * Make a standard toast that just contains a text view with the text from a resource. + * + * @param context The context to use. Usually your {@link android.app.Application} + * or {@link android.app.Activity} object. + * @param resId The resource id of the string resource to use. Can be formatted text. + * @param duration How long to display the message. Either {@link #LENGTH_SHORT} or + * {@link #LENGTH_LONG} + * @throws Resources.NotFoundException if the resource can't be found. + */ + public static Toast makeText(Context context, @StringRes int resId, int duration) + throws Resources.NotFoundException { + return makeText(context, context.getResources().getText(resId), duration); + } - /** - * Make a standard toast that just contains a text view with the text from a resource. - * - * @param context The context to use. Usually your {@link android.app.Application} - * or {@link android.app.Activity} object. - * @param resId The resource id of the string resource to use. Can be formatted text. - * @param duration How long to display the message. Either {@link #LENGTH_SHORT} or - * {@link #LENGTH_LONG} - * @throws Resources.NotFoundException if the resource can't be found. - */ - public static Toast makeText(Context context, @StringRes int resId, int duration) - throws Resources.NotFoundException { - return makeText(context, context.getResources().getText(resId), duration); - } + public @NonNull ToastCompat setBadTokenListener(@NonNull BadTokenListener listener) { + ((SafeToastContext) getView().getContext()).setBadTokenListener(listener); + return this; + } - public @NonNull ToastCompat setBadTokenListener(@NonNull BadTokenListener listener) { - ((SafeToastContext) getView().getContext()).setBadTokenListener(listener); - return this; - } + @Override + public void show() { + toast.show(); + } - @Override - public void show() { - toast.show(); - } + @Override + public void setDuration(int duration) { + toast.setDuration(duration); + } - @Override - public void setDuration(int duration) { - toast.setDuration(duration); - } + @Override + public void setGravity(int gravity, int xOffset, int yOffset) { + toast.setGravity(gravity, xOffset, yOffset); + } - @Override - public void setGravity(int gravity, int xOffset, int yOffset) { - toast.setGravity(gravity, xOffset, yOffset); - } + @Override + public void setMargin(float horizontalMargin, float verticalMargin) { + toast.setMargin(horizontalMargin, verticalMargin); + } - @Override - public void setMargin(float horizontalMargin, float verticalMargin) { - toast.setMargin(horizontalMargin, verticalMargin); - } + @Override + public void setText(int resId) { + toast.setText(resId); + } - @Override - public void setText(int resId) { - toast.setText(resId); - } + @Override + public void setText(CharSequence s) { + toast.setText(s); + } - @Override - public void setText(CharSequence s) { - toast.setText(s); - } + @Override + public void setView(View view) { + toast.setView(view); + setContext(view, new SafeToastContext(view.getContext(), this)); + } - @Override - public void setView(View view) { - toast.setView(view); - setContext(view, new SafeToastContext(view.getContext(), this)); - } + @Override + public float getHorizontalMargin() { + return toast.getHorizontalMargin(); + } - @Override - public float getHorizontalMargin() { - return toast.getHorizontalMargin(); - } - + @Override + public float getVerticalMargin() { + return toast.getVerticalMargin(); + } - @Override - public float getVerticalMargin() { - return toast.getVerticalMargin(); - } - - @Override - public int getDuration() { - return toast.getDuration(); - } + @Override + public int getDuration() { + return toast.getDuration(); + } - @Override - public int getGravity() { - return toast.getGravity(); - } + @Override + public int getGravity() { + return toast.getGravity(); + } - @Override - public int getXOffset() { - return toast.getXOffset(); - } + @Override + public int getXOffset() { + return toast.getXOffset(); + } - @Override - public int getYOffset() { - return toast.getYOffset(); - } + @Override + public int getYOffset() { + return toast.getYOffset(); + } - @Override - public View getView() { - return toast.getView(); - } + @Override + public View getView() { + return toast.getView(); + } - public @NonNull Toast getBaseToast() { - return toast; - } + public @NonNull Toast getBaseToast() { + return toast; + } - private static void setContext(@NonNull View view, @NonNull Context context) { - try { - Field field = View.class.getDeclaredField("mContext"); - field.setAccessible(true); - field.set(view, context); - } catch (Throwable throwable) { - throwable.printStackTrace(); - } + private static void setContext(@NonNull View view, @NonNull Context context) { + try { + Field field = View.class.getDeclaredField("mContext"); + field.setAccessible(true); + field.set(view, context); + } catch (Throwable throwable) { + throwable.printStackTrace(); } + } } diff --git a/library/src/test/java/me/drakeet/toast/ExampleUnitTest.java b/library/src/test/java/me/drakeet/toast/ExampleUnitTest.java deleted file mode 100644 index a3bc0b8..0000000 --- a/library/src/test/java/me/drakeet/toast/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package me.drakeet.toast; - -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() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index e5ee4fe..9eb1e02 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,35 +1,37 @@ apply plugin: 'com.android.application' android { - compileSdkVersion gradle.compileSdkVersion - buildToolsVersion gradle.buildToolsVersion - defaultConfig { - applicationId "me.drakeet.toast.sample" - minSdkVersion gradle.minSdkVersion - targetSdkVersion gradle.targetSdkVersion - versionCode gradle.versionCode - versionName gradle.versionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + compileSdkVersion gradle.compileSdkVersion + + defaultConfig { + applicationId "me.drakeet.toast.sample" + minSdkVersion gradle.minSdkVersion + targetSdkVersion gradle.targetSdkVersion + versionCode gradle.versionCode + versionName gradle.versionName + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { - implementation project(':library') - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:' + gradle.supportLibraryVersion - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + implementation project(':library') + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:' + gradle.supportLibraryVersion + 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/sample/src/androidTest/java/me/drakeet/toast/sample/MainActivityTest.java b/sample/src/androidTest/java/me/drakeet/toast/sample/MainActivityTest.java index 0d631ec..7d4d14a 100644 --- a/sample/src/androidTest/java/me/drakeet/toast/sample/MainActivityTest.java +++ b/sample/src/androidTest/java/me/drakeet/toast/sample/MainActivityTest.java @@ -19,14 +19,14 @@ @RunWith(AndroidJUnit4.class) public class MainActivityTest { - @Rule - public ActivityTestRule rule = new ActivityTestRule<>(MainActivity.class); + @Rule + public ActivityTestRule rule = new ActivityTestRule<>(MainActivity.class); - @Test - public void shouldShowToastWithHello() { - onView(withText("hello")) - .inRoot(withDecorView(not(is(rule.getActivity().getWindow().getDecorView())))) - .check(matches(isDisplayed())); - } + @Test + public void shouldShowToastWithHello() { + onView(withText("hello")) + .inRoot(withDecorView(not(is(rule.getActivity().getWindow().getDecorView())))) + .check(matches(isDisplayed())); + } } diff --git a/sample/src/main/java/me/drakeet/toast/sample/MainActivity.java b/sample/src/main/java/me/drakeet/toast/sample/MainActivity.java index a28acd7..136e2f9 100644 --- a/sample/src/main/java/me/drakeet/toast/sample/MainActivity.java +++ b/sample/src/main/java/me/drakeet/toast/sample/MainActivity.java @@ -8,13 +8,13 @@ public class MainActivity extends AppCompatActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - ToastCompat.makeText(this, "hello", Toast.LENGTH_SHORT) - .setBadTokenListener(toast -> { - Log.e("failed toast", "hello"); - }).show(); - } + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + ToastCompat.makeText(this, "hello", Toast.LENGTH_SHORT) + .setBadTokenListener(toast -> { + Log.e("failed toast", "hello"); + }).show(); + } } diff --git a/sample/src/test/java/me/drakeet/toast/ExampleUnitTest.java b/sample/src/test/java/me/drakeet/toast/ExampleUnitTest.java deleted file mode 100644 index a3bc0b8..0000000 --- a/sample/src/test/java/me/drakeet/toast/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package me.drakeet.toast; - -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() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index e487b80..f0a06ec 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,6 @@ include ':sample' include ':library' -gradle.ext.buildToolsVersion = '27.0.1' gradle.ext.supportLibraryVersion = '27.1.1' gradle.ext.versionCode = 5 gradle.ext.versionName = "1.1.0"