diff --git a/app/build.gradle b/app/build.gradle index 6b36dc3..8de2d59 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,12 +16,13 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 26 - buildToolsVersion '26.0.0' + compileSdkVersion 34 + buildToolsVersion '34.0.0' + namespace "uk.co.nickbutcher.adaptiveiconplayground" defaultConfig { applicationId "uk.co.nickbutcher.adaptiveiconplayground" minSdkVersion 26 - targetSdkVersion 26 + targetSdkVersion 34 versionCode 1 versionName "1.0" archivesBaseName = "adaptive-icon-playground" @@ -32,14 +33,19 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = "11" + } } -ext.supportLibVersion = '26.0.0-beta2' - dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" - implementation "com.android.support:recyclerview-v7:${supportLibVersion}" - implementation "com.android.support:design:${supportLibVersion}" - implementation "com.android.support:support-dynamic-animation:${supportLibVersion}" - implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta1' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'com.google.android.material:material:1.5.0' + implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 840224d..e120c54 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - - + + + - + diff --git a/app/src/main/java/uk/co/nickbutcher/adaptiveiconplayground/AdaptiveIconView.kt b/app/src/main/java/uk/co/nickbutcher/adaptiveiconplayground/AdaptiveIconView.kt index f27a276..d2e45ac 100644 --- a/app/src/main/java/uk/co/nickbutcher/adaptiveiconplayground/AdaptiveIconView.kt +++ b/app/src/main/java/uk/co/nickbutcher/adaptiveiconplayground/AdaptiveIconView.kt @@ -24,8 +24,8 @@ import android.graphics.Paint import android.graphics.Shader.TileMode.CLAMP import android.graphics.drawable.AdaptiveIconDrawable import android.graphics.drawable.Drawable -import android.support.annotation.FloatRange -import android.support.annotation.Keep +import androidx.annotation.FloatRange +import androidx.annotation.Keep import android.util.AttributeSet import android.util.TypedValue import android.view.View @@ -41,8 +41,8 @@ import kotlin.reflect.KProperty * allows animation of the corner radius. */ class AdaptiveIconView( - context: Context, - attrs: AttributeSet? + context: Context, + attrs: AttributeSet? ) : View(context, attrs, R.attr.adaptiveIconViewStyle) { private val foregroundPaint = Paint(Paint.ANTI_ALIAS_FLAG) @@ -65,6 +65,7 @@ class AdaptiveIconView( private var foregroundScale by InvalidateDelegate(0f) var cornerRadius by InvalidateDelegate(0f) + // scale & translate factors [0,1] var foregroundTranslateFactor by FloatRangeDelegate(0f) var backgroundTranslateFactor by FloatRangeDelegate(0f) @@ -82,6 +83,7 @@ class AdaptiveIconView( backgroundDy = backgroundTranslateFactor * displacementY foregroundDy = foregroundTranslateFactor * displacementY } + @Keep // called by @animator/scale var scale = 0f set(@FloatRange(from = 0.0, to = 1.0) value) { @@ -94,7 +96,8 @@ class AdaptiveIconView( init { val a = context.obtainStyledAttributes( - attrs, R.styleable.AdaptiveIconView, R.attr.adaptiveIconViewStyle, 0) + attrs, R.styleable.AdaptiveIconView, R.attr.adaptiveIconViewStyle, 0 + ) val shadowColor = a.getColor(R.styleable.AdaptiveIconView_shadowColor, Color.TRANSPARENT) shadowDY = a.getDimension(R.styleable.AdaptiveIconView_shadowDy, 0f) a.recycle() @@ -103,8 +106,11 @@ class AdaptiveIconView( color = shadowColor } } - layerSize = Math.round(TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, 108f, context.resources.displayMetrics)) + layerSize = Math.round( + TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_DIP, 108f, context.resources.displayMetrics + ) + ) layerCenter = (layerSize / 2).toFloat() iconSize = (layerSize / (1 + 2 * AdaptiveIconDrawable.getExtraInsetFraction())).toInt() viewportOffset = (layerSize - iconSize) / 2 @@ -140,14 +146,20 @@ class AdaptiveIconView( translate(left, top) if (shadowPaint != null) { translate(0f, shadowDY) - drawRoundRect(0f, 0f, iconSize.toFloat(), iconSize.toFloat(), - cornerRadius, cornerRadius, shadowPaint) + drawRoundRect( + 0f, 0f, iconSize.toFloat(), iconSize.toFloat(), + cornerRadius, cornerRadius, shadowPaint!! + ) translate(0f, -shadowDY) } - drawRoundRect(0f, 0f, iconSize.toFloat(), iconSize.toFloat(), - cornerRadius, cornerRadius, backgroundPaint) - drawRoundRect(0f, 0f, iconSize.toFloat(), iconSize.toFloat(), - cornerRadius, cornerRadius, foregroundPaint) + drawRoundRect( + 0f, 0f, iconSize.toFloat(), iconSize.toFloat(), + cornerRadius, cornerRadius, backgroundPaint + ) + drawRoundRect( + 0f, 0f, iconSize.toFloat(), iconSize.toFloat(), + cornerRadius, cornerRadius, foregroundPaint + ) restoreToCount(saveCount) } } @@ -192,9 +204,10 @@ private class InvalidateDelegate(var value: T) { * A [Float] Delegate which constrains its value between a minimum and maximum. */ private class FloatRangeDelegate( - var value: Float, - val min: Float = 0f, - val max: Float = 1f) { + var value: Float, + val min: Float = 0f, + val max: Float = 1f +) { operator fun getValue(thisRef: Any?, property: KProperty<*>) = value operator fun setValue(thisRef: Any?, property: KProperty<*>, value: Float) { this.value = value.coerceIn(min, max) diff --git a/app/src/main/java/uk/co/nickbutcher/adaptiveiconplayground/MainActivity.kt b/app/src/main/java/uk/co/nickbutcher/adaptiveiconplayground/MainActivity.kt index 0937798..534fbaa 100644 --- a/app/src/main/java/uk/co/nickbutcher/adaptiveiconplayground/MainActivity.kt +++ b/app/src/main/java/uk/co/nickbutcher/adaptiveiconplayground/MainActivity.kt @@ -15,23 +15,24 @@ package uk.co.nickbutcher.adaptiveiconplayground import android.animation.ObjectAnimator +import android.annotation.SuppressLint import android.content.Context import android.content.Intent import android.graphics.Rect import android.graphics.drawable.AdaptiveIconDrawable import android.os.Bundle -import android.support.animation.FloatPropertyCompat -import android.support.animation.SpringAnimation -import android.support.annotation.ColorInt -import android.support.annotation.DrawableRes -import android.support.annotation.FloatRange -import android.support.design.widget.BottomSheetBehavior -import android.support.v4.app.LoaderManager -import android.support.v4.content.AsyncTaskLoader -import android.support.v4.content.Loader -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.dynamicanimation.animation.FloatPropertyCompat +import androidx.dynamicanimation.animation.SpringAnimation +import androidx.annotation.ColorInt +import androidx.annotation.DrawableRes +import androidx.annotation.FloatRange +import com.google.android.material.bottomsheet.BottomSheetBehavior +import androidx.loader.app.LoaderManager +import androidx.loader.content.AsyncTaskLoader +import androidx.loader.content.Loader +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.transition.ChangeBounds import android.transition.Fade import android.transition.TransitionManager @@ -97,78 +98,87 @@ class MainActivity : AppCompatActivity() { get() = adapter?.iconCornerRadius ?: 0f set(value) { applyGridProperty( - { ad -> ad.iconCornerRadius = value }, - { iv -> iv.cornerRadius = value }) + { ad -> ad.iconCornerRadius = value }, + { iv -> iv.cornerRadius = value }) } private var velocityX = 0f set(value) { applyGridProperty( - { ad -> ad.velocityX = value }, - { iv -> iv.velocityX = value }) + { ad -> ad.velocityX = value }, + { iv -> iv.velocityX = value }) } private var velocityY = 0f set(value) { applyGridProperty( - { ad -> ad.velocityY = value }, - { iv -> iv.velocityY = value }) + { ad -> ad.velocityY = value }, + { iv -> iv.velocityY = value }) } private var foregroundTranslateFactor get() = adapter?.foregroundTranslateFactor ?: DEF_FOREGROUND_TRANSLATE_FACTOR set(value) { applyGridProperty( - { ad -> ad.foregroundTranslateFactor = value }, - { iv -> iv.foregroundTranslateFactor = value }) + { ad -> ad.foregroundTranslateFactor = value }, + { iv -> iv.foregroundTranslateFactor = value }) } private var backgroundTranslateFactor get() = adapter?.backgroundTranslateFactor ?: DEF_BACKGROUND_TRANSLATE_FACTOR set(value) { applyGridProperty( - { ad -> ad.backgroundTranslateFactor = value }, - { iv -> iv.backgroundTranslateFactor = value }) + { ad -> ad.backgroundTranslateFactor = value }, + { iv -> iv.backgroundTranslateFactor = value }) } private var foregroundScaleFactor get() = adapter?.foregroundScaleFactor ?: DEF_FOREGROUND_SCALE_FACTOR set(value) { applyGridProperty( - { ad -> ad.foregroundScaleFactor = value }, - { iv -> iv.foregroundScaleFactor = value }) + { ad -> ad.foregroundScaleFactor = value }, + { iv -> iv.foregroundScaleFactor = value }) } private var backgroundScaleFactor get() = adapter?.backgroundScaleFactor ?: DEF_BACKGROUND_SCALE_FACTOR set(value) { applyGridProperty( - { ad -> ad.backgroundScaleFactor = value }, - { iv -> iv.backgroundScaleFactor = value }) + { ad -> ad.backgroundScaleFactor = value }, + { iv -> iv.backgroundScaleFactor = value }) } + @SuppressLint("WrongConstant") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) val res = resources findViewById(android.R.id.content).systemUiVisibility = - (View.SYSTEM_UI_FLAG_LAYOUT_STABLE - or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR) + (View.SYSTEM_UI_FLAG_LAYOUT_STABLE + or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR) grid.setHasFixedSize(true) - grid.addItemDecoration(CenteringDecoration(res.getInteger(R.integer.spans), - res.getDimensionPixelSize(R.dimen.icon_size))) + grid.addItemDecoration( + CenteringDecoration( + res.getInteger(R.integer.spans), + res.getDimensionPixelSize(R.dimen.icon_size) + ) + ) val fastOutSlowIn = AnimationUtils.loadInterpolator( - this, android.R.interpolator.fast_out_slow_in) + this, android.R.interpolator.fast_out_slow_in + ) findViewById(R.id.mask).setOnClickListener { corner = ++corner % corners.size - with(ObjectAnimator.ofFloat( + with( + ObjectAnimator.ofFloat( this@MainActivity, ICON_CORNER_RADIUS, - corners[corner])) { + corners[corner] + ) + ) { duration = 200L interpolator = fastOutSlowIn start() @@ -186,10 +196,10 @@ class MainActivity : AppCompatActivity() { findViewById(R.id.orientation).setOnClickListener { view -> orientation = orientation xor 1 view.animate() - .rotation(if (orientation == VERTICAL) 90f else 0f) - .setDuration(160L) - .setInterpolator(fastOutSlowIn) - .start() + .rotation(if (orientation == VERTICAL) 90f else 0f) + .setDuration(160L) + .setInterpolator(fastOutSlowIn) + .start() TransitionManager.beginDelayedTransition(grid, reorient) (grid.layoutManager as GridLayoutManager).orientation = orientation } @@ -205,47 +215,52 @@ class MainActivity : AppCompatActivity() { systemUiVisibility = systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR } else { systemUiVisibility = - systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() + systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() } } } findViewById(R.id.foreground_parallax) - .onSeek { progress -> foregroundTranslateFactor = progress / 100f } + .onSeek { progress -> foregroundTranslateFactor = progress / 100f } findViewById(R.id.background_parallax) - .onSeek { progress -> backgroundTranslateFactor = progress / 100f } + .onSeek { progress -> backgroundTranslateFactor = progress / 100f } findViewById(R.id.foreground_scale) - .onSeek { progress -> foregroundScaleFactor = progress / 100f } + .onSeek { progress -> foregroundScaleFactor = progress / 100f } findViewById(R.id.background_scale) - .onSeek { progress -> backgroundScaleFactor = progress / 100f } + .onSeek { progress -> backgroundScaleFactor = progress / 100f } BottomSheetBehavior.from(findViewById(R.id.settings_sheet)).setBottomSheetCallback( - object : BottomSheetBehavior.BottomSheetCallback() { - override fun onStateChanged(bottomSheet: View, newState: Int) {} - - override fun onSlide(bottomSheet: View, slideOffset: Float) { - // make the sheet more opaque [80%–95%] as it slides up - val alpha = 204 + (38 * slideOffset).toInt() - val color = 0xccffffff.toInt() and 0x00ffffff or (alpha shl 24) - bottomSheet.setBackgroundColor(color) - } - }) + object : BottomSheetBehavior.BottomSheetCallback() { + override fun onStateChanged(bottomSheet: View, newState: Int) {} + + override fun onSlide(bottomSheet: View, slideOffset: Float) { + // make the sheet more opaque [80%–95%] as it slides up + val alpha = 204 + (38 * slideOffset).toInt() + val color = 0xccffffff.toInt() and 0x00ffffff or (alpha shl 24) + bottomSheet.setBackgroundColor(color) + } + }) supportLoaderManager.initLoader(0, Bundle.EMPTY, - object : LoaderManager.LoaderCallbacks> { - override fun onCreateLoader(id: Int, args: Bundle) = - AdaptiveIconLoader(applicationContext) - - override fun onLoadFinished(loader: Loader>, - data: List) { - findViewById(R.id.loading).visibility = GONE - adapter = IconAdapter(data, corners[0]) - grid.adapter = adapter - grid.setOnTouchListener(gridTouch) - } + object : LoaderManager.LoaderCallbacks> { + override fun onCreateLoader( + id: Int, + args: Bundle? + ): Loader> = + AdaptiveIconLoader(applicationContext) + + override fun onLoadFinished( + loader: Loader>, + data: List + ) { + findViewById(R.id.loading).visibility = GONE + adapter = IconAdapter(data, corners[0]) + grid.adapter = adapter + grid.setOnTouchListener(gridTouch) + } - override fun onLoaderReset(loader: Loader>) {} - }) + override fun onLoaderReset(loader: Loader>) {} + }) } private fun releaseVelocity(releaseVelocityX: Float, releaseVelocityY: Float) { @@ -271,18 +286,19 @@ class MainActivity : AppCompatActivity() { * Helper function for setting a property on both the adapter and on all views in the grid */ private inline fun applyGridProperty( - adapterAction: (IconAdapter) -> Unit, - iconViewAction: (AdaptiveIconView) -> Unit) { + adapterAction: (IconAdapter) -> Unit, + iconViewAction: (AdaptiveIconView) -> Unit + ) { adapter?.let { adapterAction(it) (0 until grid.childCount) - .map { grid.getChildAt(it) as AdaptiveIconView } - .forEach { iconViewAction(it) } + .map { grid.getChildAt(it) as AdaptiveIconView } + .forEach { iconViewAction(it) } } } - private class AdaptiveIconLoader(context: Context) - : AsyncTaskLoader>(context) { + private class AdaptiveIconLoader(context: Context) : + AsyncTaskLoader>(context) { private val icons = ArrayList() @@ -312,15 +328,15 @@ class MainActivity : AppCompatActivity() { return adaptiveIcons } - override fun deliverResult(data: List) { - icons += data + override fun deliverResult(data: List?) { + icons += data!! super.deliverResult(data) } } private class IconAdapter( - private val adaptiveIcons: List, - var iconCornerRadius: Float + private val adaptiveIcons: List, + var iconCornerRadius: Float ) : RecyclerView.Adapter() { var velocityX = 0f @@ -331,8 +347,10 @@ class MainActivity : AppCompatActivity() { var backgroundScaleFactor = DEF_BACKGROUND_SCALE_FACTOR override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = - IconViewHolder(LayoutInflater.from(parent.context) - .inflate(R.layout.icon, parent, false)) + IconViewHolder( + LayoutInflater.from(parent.context) + .inflate(R.layout.icon, parent, false) + ) override fun onBindViewHolder(holder: IconViewHolder, position: Int) { holder.icon.apply { @@ -359,10 +377,11 @@ class MainActivity : AppCompatActivity() { } private enum class Decor( - @DrawableRes val background: Int, - @ColorInt val status: Int, - val darkStatusIcons: Boolean, - @DrawableRes val icon: Int) { + @DrawableRes val background: Int, + @ColorInt val status: Int, + val darkStatusIcons: Boolean, + @DrawableRes val icon: Int + ) { Wallpaper(R.drawable.wallpaper, 0x99000000.toInt(), false, R.drawable.ic_wallpaper), Light(R.drawable.wallpaper_light, 0xb3eeeeee.toInt(), true, R.drawable.ic_light), @@ -373,15 +392,19 @@ class MainActivity : AppCompatActivity() { } private class CenteringDecoration( - private val spanCount: Int, - private val iconSize: Int + private val spanCount: Int, + private val iconSize: Int ) : RecyclerView.ItemDecoration() { private val offsets = Rect() private var initialized = false - override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, - state: RecyclerView.State?) { + override fun getItemOffsets( + outRect: Rect, + view: View, + parent: RecyclerView, + state: RecyclerView.State + ) { if (!initialized) calculateOffsets(parent) outRect.set(offsets) } @@ -401,7 +424,8 @@ class MainActivity : AppCompatActivity() { setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener { override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) = - progressChanged(progress) + progressChanged(progress) + override fun onStartTrackingTouch(seekBar: SeekBar) = Unit override fun onStopTrackingTouch(seekBar: SeekBar) = Unit }) @@ -422,8 +446,10 @@ class MainActivity : AppCompatActivity() { private val ICON_CORNER_RADIUS = object : FloatProperty("iconCornerRadius") { override fun get(activity: MainActivity) = activity.iconCornerRadius - override fun setValue(activity: MainActivity, - @FloatRange(from = 0.0) cornerRadius: Float) { + override fun setValue( + activity: MainActivity, + @FloatRange(from = 0.0) cornerRadius: Float + ) { activity.iconCornerRadius = cornerRadius } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c3624ee..2aaa618 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,4 @@ - - - - - - + android:paddingTop="16dp" + android:paddingBottom="64dp"> @@ -130,9 +128,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:max="20" - android:paddingBottom="16dp" android:paddingHorizontal="16dp" android:paddingTop="8dp" + android:paddingBottom="16dp" android:progress="8" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/background_parallax_label" /> @@ -152,9 +150,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:max="50" - android:paddingBottom="16dp" android:paddingHorizontal="16dp" android:paddingTop="8dp" + android:paddingBottom="16dp" android:progress="20" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/foreground_scale_label" /> @@ -174,9 +172,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:max="50" - android:paddingBottom="16dp" android:paddingHorizontal="16dp" android:paddingTop="8dp" + android:paddingBottom="16dp" android:progress="30" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/background_scale_label" /> @@ -197,9 +195,9 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:max="3000" - android:paddingBottom="16dp" android:paddingHorizontal="16dp" android:paddingTop="8dp" + android:paddingBottom="16dp" android:progress="500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/stiffness_label" /> @@ -219,15 +217,15 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:max="100" - android:paddingBottom="16dp" android:paddingHorizontal="16dp" android:paddingTop="8dp" + android:paddingBottom="16dp" android:progress="30" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/damping_label" /> - + - + - + diff --git a/build.gradle b/build.gradle index 67751fc..583a068 100644 --- a/build.gradle +++ b/build.gradle @@ -13,14 +13,14 @@ */ buildscript { - ext.kotlin_version = '1.1.3-2' + ext.kotlin_version = '1.9.22' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha7' + classpath 'com.android.tools.build:gradle:8.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 25cb095..2c35211 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 096d717..09523c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Mon Jul 03 10:48:53 BST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip diff --git a/gradlew b/gradlew index cccdd3d..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,130 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,22 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,25 +27,29 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -35,48 +57,36 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal