Permalink
Browse files

update tooling

  • Loading branch information...
1 parent bc1c123 commit 942a92370886f6f1f979f26b1a6116866083d4d0 @Zhuinden committed Sep 20, 2016
View
@@ -8,9 +8,9 @@ buildscript {
maven { url "https://jitpack.io" }
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.1.2'
+ classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
- classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+ classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@@ -5,7 +5,7 @@ group='com.github.Zhuinden'
android {
compileSdkVersion 24
- buildToolsVersion "24.0.1"
+ buildToolsVersion "24.0.2"
defaultConfig {
minSdkVersion 14
@@ -1,7 +1,7 @@
package flowless;
import android.content.Context;
-import android.support.annotation.Nullable;
+import android.support.annotation.NonNull;
import android.view.View;
import java.util.HashMap;
@@ -55,17 +55,17 @@ public ServiceProvider() {
return this;
}
- @Nullable
+ @NonNull
public <T> T getService(View view, String tag) {
return getService(Flow.getKey(view), tag);
}
- @Nullable
+ @NonNull
public <T> T getService(Context context, String tag) {
return getService(Flow.getKey(context), tag);
}
- @Nullable
+ @NonNull
public <T> T getService(Object key, String tag) {
if(!services.containsKey(key)) {
throw new NoServiceException(key, tag);
@@ -1,7 +1,6 @@
package flowless.preset;
import android.app.Activity;
-import android.app.Application;
import android.content.Context;
import android.support.annotation.NonNull;
import android.view.ViewGroup;
@@ -28,7 +27,7 @@ public void setRoot(ViewGroup root) {
protected Context baseContext;
protected final RootHolder rootHolder;
- protected final FlowLifecycleProvider flowLifecycleProvider;
+ protected FlowLifecycleProvider flowLifecycleProvider;
protected final Activity activity;
@@ -1,6 +1,6 @@
-#Wed Jan 20 13:30:03 EST 2016
+#Tue Sep 20 21:37:30 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 comments on commit 942a923

Please sign in to comment.