diff options
| author | Uipko Berghuis <uipko.berghuis@fox-it.com> | 2019-11-09 15:01:38 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2019-11-17 10:16:01 +0100 |
| commit | 0ff43d3ffbc3fc7e1ef26967b602e46f0bf936e9 (patch) | |
| tree | 48dcae097ddebf8133a9bd7f5e584d29a273631f | |
| parent | 35f704b20ac3149275ca2074f6326dc45d2c459a (diff) | |
Upgrade to gradle 5.6.4 and android gradle plugin 3.5.2
| -rw-r--r-- | build.gradle.kts | 4 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 3 | ||||
| -rw-r--r-- | main/build.gradle.kts | 2 | ||||
| -rw-r--r-- | main/src/ui/java/android/support/v4n/view/ViewPager.java | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index b7f901d8..9a1fa549 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:3.5.1") + classpath("com.android.tools.build:gradle:3.5.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50") } } @@ -18,4 +18,4 @@ buildscript { repositories { google() -}
\ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4dc617b8..9abb803e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip + diff --git a/main/build.gradle.kts b/main/build.gradle.kts index 7337dc0d..d66a99e4 100644 --- a/main/build.gradle.kts +++ b/main/build.gradle.kts @@ -2,7 +2,6 @@ * Copyright (c) 2012-2016 Arne Schwabe * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ -import java.util.Properties plugins { id("com.android.application") @@ -156,6 +155,7 @@ preBuildTask.dependsOn(swigTask) /* Normally you would put these on top but then it errors out on unknown configurations */ dependencies { implementation("androidx.annotation:annotation:1.1.0") + implementation("androidx.core:core:1.1.0") // Is there a nicer way to do this? dependencies.add("uiImplementation", "androidx.constraintlayout:constraintlayout:1.1.3") diff --git a/main/src/ui/java/android/support/v4n/view/ViewPager.java b/main/src/ui/java/android/support/v4n/view/ViewPager.java index 1b724118..aa360aa2 100644 --- a/main/src/ui/java/android/support/v4n/view/ViewPager.java +++ b/main/src/ui/java/android/support/v4n/view/ViewPager.java @@ -1788,8 +1788,8 @@ public class ViewPager extends ViewGroup { final int childCount = getChildCount(); for (int i = 0; i < childCount; i++) { final int layerType = enable ? - ViewCompat.LAYER_TYPE_HARDWARE : ViewCompat.LAYER_TYPE_NONE; - ViewCompat.setLayerType(getChildAt(i), layerType, null); + View.LAYER_TYPE_HARDWARE : View.LAYER_TYPE_NONE; + getChildAt(i).setLayerType(layerType, null); } } |