diff --git a/build.gradle b/build.gradle index 50cb14b..e7bc7f1 100644 --- a/build.gradle +++ b/build.gradle @@ -2,13 +2,12 @@ buildscript { repositories { - jcenter() google() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.3.1' - classpath 'com.github.dcendents:android-maven-plugin:1.2' + classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -17,8 +16,8 @@ buildscript { allprojects { repositories { - jcenter() google() + jcenter() } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1353677..5c2d1cf 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 5c1b6c9..f4d7b2b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d..b0d6d0a 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or 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 +# +# http://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. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ 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="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index e95643d..15e1ee3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@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 http://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 + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @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 diff --git a/library/build.gradle b/library/build.gradle index 4d0a8bf..1acb102 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,33 +1,22 @@ apply plugin: 'com.android.library' -ext { - PUBLISH_GROUP_ID = 'tk.wasdennnoch' - PUBLISH_ARTIFACT_ID = 'progresstoolbar' - PUBLISH_VERSION = '1.0.6' -} - android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { - minSdkVersion 14 - targetSdkVersion 28 + minSdkVersion 16 + targetSdkVersion 29 versionCode 4 - versionName "1.0.6" + versionName "1.0.7" } buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - lintOptions { - abortOnError false // Because lint doesn't detect that setProgressTintList is overridden in MaterialProgressBar - } } dependencies { api 'me.zhanghai.android.materialprogressbar:library:1.6.1' } - -apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle' \ No newline at end of file diff --git a/readme.md b/readme.md index f9c31f7..35fdc59 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,6 @@ # ProgressToolbar +[![API](https://img.shields.io/badge/API-16%2B-blue.svg)](https://android-arsenal.com/api?level=16) [![JitPack](https://img.shields.io/jitpack/v/1951FDG/ProgressToolbar.svg)](https://jitpack.io/#1951FDG/ProgressToolbar) ProgressToolbar is a library that adds a compact `Toolbar` widget which contains an animatable `ProgressBar`. @@ -18,10 +19,10 @@ You can download a sample app of this library [here](https://github.com/1951FDG/ This library is available via JitPack. Simply add this to your `build.gradle` file: ```gradle -implementation 'com.github.1951FDG:ProgressToolbar:1.0.6' +implementation 'com.github.1951FDG:ProgressToolbar:1.0.7' ``` -The `minSdkVersion` is `14`. +The `minSdkVersion` is `16`. The changelog can be found [here](https://github.com/wasdennnoch/ProgressToolbar/blob/master/changelog.md). @@ -35,9 +36,7 @@ The integrated `ProgressBar` uses the library [MaterialProgressBar](https://gith android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" - app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/> + android:background="?attr/colorPrimary"/> ``` Available XML tags and Java methods (getters not included): @@ -59,7 +58,7 @@ Available XML tags and Java methods (getters not included): ## License - Copyright 2016 MrWasdennnoch@xda Copyright 2018 1951FDG + Copyright 2016 MrWasdennnoch@xda Copyright 2019 1951FDG Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/sample/build.gradle b/sample/build.gradle index ebc03c5..3ef690f 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,19 +1,20 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { applicationId "tk.wasdennnoch.progresstoolbar.sample" - minSdkVersion 14 - targetSdkVersion 28 + minSdkVersion 16 + targetSdkVersion 29 versionCode 4 - versionName "1.0.3" + versionName "1.0.7" } buildTypes { release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + shrinkResources true + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } } diff --git a/sample/src/main/java/tk/wasdennnoch/progresstoolbar/sample/MainActivity.java b/sample/src/main/java/tk/wasdennnoch/progresstoolbar/sample/MainActivity.java index ae05cca..61ed688 100644 --- a/sample/src/main/java/tk/wasdennnoch/progresstoolbar/sample/MainActivity.java +++ b/sample/src/main/java/tk/wasdennnoch/progresstoolbar/sample/MainActivity.java @@ -98,7 +98,7 @@ public boolean onCreateOptionsMenu(Menu menu) { menu.add("Github").setIcon(R.drawable.ic_github).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://github.com/wasdennnoch/ProgressToolbar"))); + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/1951FDG/ProgressToolbar"))); return true; } }).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);