Skip to content

Commit 77998cd

Browse files
author
jenly1314
committed
移除appcompat依赖,适配AndroidX
1 parent bb0f933 commit 77998cd

File tree

19 files changed

+121
-92
lines changed

19 files changed

+121
-92
lines changed

.circleci/config.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
version: 2
2+
jobs:
3+
build:
4+
working_directory: ~/code
5+
docker:
6+
- image: circleci/android:api-28
7+
environment:
8+
JVM_OPTS: -Xmx3200m
9+
steps:
10+
- checkout
11+
- restore_cache:
12+
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}
13+
- run:
14+
name: Download Dependencies
15+
command: ./gradlew androidDependencies
16+
- save_cache:
17+
paths:
18+
- ~/.gradle
19+
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}
20+
- run:
21+
name: Run Tests
22+
command: ./gradlew lint test
23+
- store_artifacts:
24+
path: app/build/reports
25+
destination: reports
26+
- store_test_results:
27+
path: app/build/test-results

.idea/codeStyles/Project.xml

-25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/encodings.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/markdown-navigator/profiles_settings.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+8-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.travis.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,32 @@
11
language: android
2+
dist: trusty
23
jdk: oraclejdk8
3-
before_install:
4-
- yes | sdkmanager "platforms;android-28"
4+
sudo: false
55

66
env:
77
global:
88
- ANDROID_API_LEVEL=28
99
- ANDROID_BUILD_TOOLS_VERSION=28.0.3
1010
- TRAVIS_SECURE_ENV_VARS=true
1111

12+
before_install:
13+
- chmod +x gradlew
14+
- mkdir "$ANDROID_HOME/licenses" || true
15+
# Hack to accept Android licenses
16+
- yes | sdkmanager "platforms;android-$ANDROID_API_LEVEL"
17+
18+
1219
android:
1320
components:
1421
# The BuildTools version used by your project
1522
- tools
1623
- platform-tools
1724
- build-tools-$ANDROID_BUILD_TOOLS_VERSION
18-
- extra-android-m2repository
19-
- extra-google-android-support
20-
2125
# The SDK version used to compile your project
2226
- android-$ANDROID_API_LEVEL
23-
licenses:
24-
- '.+'
27+
- extra-android-m2repository
28+
- extra-google-android-support
2529

2630
script:
2731
- ./gradlew clean
28-
- ./gradlew assembleDebug
32+
- ./gradlew assembleRelease

README.md

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# CircleProgressView
22

33
[![Download](https://img.shields.io/badge/download-App-blue.svg)](https://raw.githubusercontent.com/jenly1314/CircleProgressView/master/app/release/app-release.apk)
4-
[![Jitpack](https://jitpack.io/v/jenly1314/CircleProgressView.svg)](https://jitpack.io/#jenly1314/CircleProgressView)
4+
[![JitPack](https://jitpack.io/v/jenly1314/CircleProgressView.svg)](https://jitpack.io/#jenly1314/CircleProgressView)
55
[![CI](https://travis-ci.org/jenly1314/CircleProgressView.svg?branch=master)](https://travis-ci.org/jenly1314/CircleProgressView)
6+
[![CircleCI](https://circleci.com/gh/jenly1314/CircleProgressView.svg?style=svg)](https://circleci.com/gh/jenly1314/CircleProgressView)
67
[![API](https://img.shields.io/badge/API-16%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=16)
78
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/mit-license.php)
8-
[![Blog](https://img.shields.io/badge/blog-Jenly-9933CC.svg)](http://blog.csdn.net/jenly121)
9+
[![Blog](https://img.shields.io/badge/blog-Jenly-9933CC.svg)](https://jenly1314.github.io/)
910
[![QQGroup](https://img.shields.io/badge/QQGroup-20867961-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=8fcc6a2f88552ea44b1411582c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad)
1011

1112
CircleProgressView for Android 是一个圆形的进度动画控件,动画效果纵享丝滑。
@@ -43,18 +44,18 @@ CircleProgressView for Android 是一个圆形的进度动画控件,动画效
4344
<dependency>
4445
<groupId>com.king.view</groupId>
4546
<artifactId>circleprogressview</artifactId>
46-
<version>1.0.1</version>
47+
<version>1.1.0</version>
4748
<type>pom</type>
4849
</dependency>
4950
```
5051
### Gradle:
5152
```gradle
52-
implementation 'com.king.view:circleprogressview:1.0.1'
53+
implementation 'com.king.view:circleprogressview:1.1.0'
5354
```
5455

5556
### Lvy:
5657
```lvy
57-
<dependency org='com.king.view' name='circleprogressview' rev='1.0.1'>
58+
<dependency org='com.king.view' name='circleprogressview' rev='1.1.0'>
5859
<artifact name='$AID' ext='pom'></artifact>
5960
</dependency>
6061
```
@@ -68,11 +69,6 @@ allprojects {
6869
}
6970
```
7071

71-
## 引入的库:
72-
```gradle
73-
compileOnly 'com.android.support:appcompat-v7:28.0.0'
74-
```
75-
7672
## 示例
7773

7874
布局示例
@@ -96,6 +92,9 @@ compileOnly 'com.android.support:appcompat-v7:28.0.0'
9692

9793
## 版本记录
9894

95+
#### v1.1.0:2019-8-19
96+
* 移除appcompat依赖,适配AndroidX
97+
9998
#### v1.0.1:2019-5-23
10099
* 新增cpvTurn属性(是否旋转)
101100

@@ -118,6 +117,8 @@ compileOnly 'com.android.support:appcompat-v7:28.0.0'
118117

119118
CSDN: <a title="CSDN博客" href="http://blog.csdn.net/jenly121" target="_blank">jenly121</a>
120119

120+
博客园: <a title="博客园" href="https://www.cnblogs.com/jenly" target="_blank">jenly</a>
121+
121122
Github: <a title="Github开源项目" href="https://github.com/jenly1314" target="_blank">jenly1314</a>
122123

123124
加入QQ群: <a title="点击加入QQ群" href="http://shang.qq.com/wpa/qunwpa?idkey=8fcc6a2f88552ea44b1411582c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad" target="_blank">20867961</a>

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
targetSdkVersion build_versions.targetSdk
1111
versionCode app_version.versionCode
1212
versionName app_version.versionName
13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414

1515
}
1616
buildTypes {

app/release/app-release.apk

1.73 KB
Binary file not shown.

app/release/output.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/androidTest/java/com/king/circleprogressview/ExampleInstrumentedTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.king.circleprogressview;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
64

75
import org.junit.Test;
86
import org.junit.runner.RunWith;
97

8+
import androidx.test.InstrumentationRegistry;
9+
import androidx.test.runner.AndroidJUnit4;
10+
1011
import static org.junit.Assert.*;
1112

1213
/**

app/src/main/java/com/king/circleprogressview/MainActivity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.king.circleprogressview;
22

3-
import android.support.v7.app.AppCompatActivity;
43
import android.os.Bundle;
54
import android.view.View;
65
import android.widget.CheckBox;
76
import android.widget.CompoundButton;
87

98
import com.king.view.circleprogressview.CircleProgressView;
109

10+
import androidx.appcompat.app.AppCompatActivity;
11+
1112
public class MainActivity extends AppCompatActivity {
1213

1314
private CircleProgressView cpv;

build.gradle

+3-7
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
buildscript {
44
apply from: 'versions.gradle'
55

6-
repositories {
7-
google()
8-
jcenter()
9-
}
6+
addRepos(repositories)
7+
108
dependencies {
119
classpath 'com.android.tools.build:gradle:3.2.1'
1210
classpath 'com.novoda:bintray-release:0.9'
@@ -17,9 +15,7 @@ buildscript {
1715
}
1816

1917
allprojects {
20-
repositories {
21-
addRepos(repositories)
22-
}
18+
addRepos(repositories)
2319
}
2420

2521
task clean(type: Delete) {

gradle.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ org.gradle.jvmargs = -Xmx1536m
1111
# This option should only be used with decoupled projects. More details, visit
1212
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1313
# org.gradle.parallel=true
14-
14+
android.useAndroidX=true
15+
android.enableJetifier=true
1516

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
distributionBase = GRADLE_USER_HOME
2-
distributionPath = wrapper/dists
3-
distributionUrl = https\://services.gradle.org/distributions/gradle-4.6-all.zip
4-
zipStoreBase = GRADLE_USER_HOME
5-
zipStorePath = wrapper/dists
1+
#Mon Aug 19 10:11:07 CST 2019
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

lib/build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
versionCode app_version.versionCode
1212
versionName app_version.versionName
1313

14-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515

1616
}
1717
buildTypes {
@@ -32,6 +32,4 @@ dependencies {
3232
androidTestImplementation deps.test.runner
3333
androidTestImplementation deps.test.espresso
3434

35-
compileOnly deps.support.appcompat
36-
3735
}

lib/src/androidTest/java/com/king/view/circleprogressview/ExampleInstrumentedTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.king.view.circleprogressview;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
64

75
import org.junit.Test;
86
import org.junit.runner.RunWith;
97

8+
import androidx.test.InstrumentationRegistry;
9+
import androidx.test.runner.AndroidJUnit4;
10+
1011
import static org.junit.Assert.*;
1112

1213
/**

0 commit comments

Comments
 (0)