Skip to content

Commit b24023b

Browse files
committed
Update to Android Studio 3.5
1 parent 89cab12 commit b24023b

File tree

9 files changed

+57
-37
lines changed

9 files changed

+57
-37
lines changed

build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
65
google()
6+
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.3.1'
10-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.3.1'
11-
classpath 'com.github.dcendents:android-maven-plugin:1.2'
9+
classpath 'com.android.tools.build:gradle:3.5.0'
10+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1211

1312
// NOTE: Do not place your application dependencies here; they belong
1413
// in the individual module build.gradle files
@@ -17,8 +16,8 @@ buildscript {
1716

1817
allprojects {
1918
repositories {
20-
jcenter()
2119
google()
20+
jcenter()
2221
}
2322
}
2423

gradle/wrapper/gradle-wrapper.jar

-561 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 17 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 17 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

library/build.gradle

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,22 @@
11
apply plugin: 'com.android.library'
22

3-
ext {
4-
PUBLISH_GROUP_ID = 'tk.wasdennnoch'
5-
PUBLISH_ARTIFACT_ID = 'progresstoolbar'
6-
PUBLISH_VERSION = '1.0.6'
7-
}
8-
93
android {
10-
compileSdkVersion 28
4+
compileSdkVersion 29
115

126
defaultConfig {
13-
minSdkVersion 14
14-
targetSdkVersion 28
7+
minSdkVersion 16
8+
targetSdkVersion 29
159
versionCode 4
16-
versionName "1.0.6"
10+
versionName "1.0.7"
1711
}
1812
buildTypes {
1913
release {
2014
minifyEnabled false
21-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
15+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2216
}
2317
}
24-
lintOptions {
25-
abortOnError false // Because lint doesn't detect that setProgressTintList is overridden in MaterialProgressBar
26-
}
2718
}
2819

2920
dependencies {
3021
api 'me.zhanghai.android.materialprogressbar:library:1.6.1'
3122
}
32-
33-
apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'

readme.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# ProgressToolbar
22

3+
[![API](https://img.shields.io/badge/API-16%2B-blue.svg)](https://android-arsenal.com/api?level=16)
34
[![JitPack](https://img.shields.io/jitpack/v/1951FDG/ProgressToolbar.svg)](https://jitpack.io/#1951FDG/ProgressToolbar)
45

56
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/
1819
This library is available via JitPack. Simply add this to your `build.gradle` file:
1920

2021
```gradle
21-
implementation 'com.github.1951FDG:ProgressToolbar:1.0.6'
22+
implementation 'com.github.1951FDG:ProgressToolbar:1.0.7'
2223
```
2324

24-
The `minSdkVersion` is `14`.
25+
The `minSdkVersion` is `16`.
2526

2627
The changelog can be found [here](https://github.com/wasdennnoch/ProgressToolbar/blob/master/changelog.md).
2728

@@ -35,9 +36,7 @@ The integrated `ProgressBar` uses the library [MaterialProgressBar](https://gith
3536
android:id="@+id/toolbar"
3637
android:layout_width="match_parent"
3738
android:layout_height="?attr/actionBarSize"
38-
android:background="?attr/colorPrimary"
39-
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
40-
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
39+
android:background="?attr/colorPrimary"/>
4140
```
4241

4342
Available XML tags and Java methods (getters not included):
@@ -59,7 +58,7 @@ Available XML tags and Java methods (getters not included):
5958

6059
## License
6160

62-
Copyright 2016 MrWasdennnoch@xda Copyright 2018 1951FDG
61+
Copyright 2016 MrWasdennnoch@xda Copyright 2019 1951FDG
6362

6463
Licensed under the Apache License, Version 2.0 (the "License");
6564
you may not use this file except in compliance with the License.

sample/build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 28
4+
compileSdkVersion 29
55

66
defaultConfig {
77
applicationId "tk.wasdennnoch.progresstoolbar.sample"
8-
minSdkVersion 14
9-
targetSdkVersion 28
8+
minSdkVersion 16
9+
targetSdkVersion 29
1010
versionCode 4
11-
versionName "1.0.3"
11+
versionName "1.0.7"
1212
}
1313
buildTypes {
1414
release {
15-
minifyEnabled false
16-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
15+
shrinkResources true
16+
minifyEnabled true
17+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
1718
}
1819
}
1920
}

sample/src/main/java/tk/wasdennnoch/progresstoolbar/sample/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
9898
menu.add("Github").setIcon(R.drawable.ic_github).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
9999
@Override
100100
public boolean onMenuItemClick(MenuItem item) {
101-
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://github.com/wasdennnoch/ProgressToolbar")));
101+
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/1951FDG/ProgressToolbar")));
102102
return true;
103103
}
104104
}).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);

0 commit comments

Comments
 (0)