From 91bb35cf219648e60801942f1792f09d4541180e Mon Sep 17 00:00:00 2001 From: Ben Weiss Date: Fri, 18 Aug 2017 11:37:24 +0100 Subject: [PATCH] Update gradle versions --- .../com/google/samples/apps/topeka/widget/quiz/AbsQuizView.kt | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/google/samples/apps/topeka/widget/quiz/AbsQuizView.kt b/app/src/main/java/com/google/samples/apps/topeka/widget/quiz/AbsQuizView.kt index b23ebf42..2341a7e7 100644 --- a/app/src/main/java/com/google/samples/apps/topeka/widget/quiz/AbsQuizView.kt +++ b/app/src/main/java/com/google/samples/apps/topeka/widget/quiz/AbsQuizView.kt @@ -274,7 +274,7 @@ abstract class AbsQuizView> if (context is QuizActivity) (context as QuizActivity).proceed() } - protected fun inflate(@LayoutRes resId: Int) = + protected fun inflate(@LayoutRes resId: Int) = layoutInflater.inflate(resId, this, false) as T } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 94f62d8f..ba70ea4d 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha6' + classpath 'com.android.tools.build:gradle:3.0.0-beta2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c0f67296..a19d27c1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 05 14:45:55 BST 2017 +#Mon Aug 07 15:43:31 BST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip