diff --git a/README.md b/README.md index 0697f42..bc23f9e 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ``` gradle dependencies { - implementation 'com.github.ybq:Android-SpinKit:1.4.0' + implementation 'com.github.ybq:Android-SpinKit:1.4.1' } ``` diff --git a/README_zh-CN.md b/README_zh-CN.md deleted file mode 100644 index 5898aae..0000000 --- a/README_zh-CN.md +++ /dev/null @@ -1,75 +0,0 @@ - -# Android-SpinKit - -> Android 加载动画([SpinKit](https://tobiasahlin.com/spinkit)的Android版本实现) - -[Demo Apk](https://raw.githubusercontent.com/ybq/AndroidSpinKit/master/art/spinkit.apk) - -## 效果 - - - - - - -## Gradle 依赖 - - - ``` gradle -dependencies { - implementation 'com.github.ybq:Android-SpinKit:1.4.0' - } - ``` - - -## 使用 -- Xml - - ```xml - - ``` - - -- ProgressBar - - ```java -ProgressBar progressBar = (ProgressBar)findViewById(R.id.progress); -DoubleBounce doubleBounce = new DoubleBounce(); -progressBar.setIndeterminateDrawable(doubleBounce); -``` - -###样式: - -样式 | 预览 ------------- | ------------- -RotatingPlane | RotatingPlane -DoubleBounce | DoubleBounce -Wave | Wave -WanderingCubes | WanderingCubes -Pulse | Pulse -ChasingDots | ChasingDots -ThreeBounce | ThreeBounce -Circle | Circle -CubeGrid | CubeGrid -FadingCircle | FadingCircle -FoldingCube | FoldingCube -RotatingCircle | RotatingCircle - - - - - - - -##感谢 -- [SpinKit](https://github.com/tobiasahlin/SpinKit). - - - diff --git a/build.gradle b/build.gradle index 753a2d6..4b78a77 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,18 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' - classpath 'com.novoda:bintray-release:0.8.1' + classpath 'com.android.tools.build:gradle:8.0.2' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" } } allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a116b8b..459d236 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip diff --git a/library/build.gradle b/library/build.gradle index 8a24be4..ab0b625 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,28 +1,32 @@ apply plugin: 'com.android.library' -apply plugin: 'com.novoda.bintray-release' +apply plugin: 'maven-publish' android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + namespace 'com.github.ybq.android.spinkit' + + compileSdkVersion 34 defaultConfig { - minSdkVersion 14 - targetSdkVersion 28 + minSdkVersion 23 + targetSdkVersion 34 } lintOptions { abortOnError false } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } } - -publish { - userOrg = 'ybq' - groupId = 'com.github.ybq' - artifactId = 'Android-SpinKit' - publishVersion = '1.4.0' - desc = 'Android loading animations' - website = 'https://github.com/ybq/Android-SpinKit' - licences = ['MIT'] +publishing { + publications { + release(MavenPublication) { + groupId = 'com.github.ybq.android.spinkit' + artifactId = 'library' + version = '1.0' + } + } } \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index 4dff105..53e3820 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -2,13 +2,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + namespace 'com.github.ybq.android.loading' + compileSdkVersion 34 defaultConfig { applicationId "com.github.ybq.android.spinkit" - minSdkVersion 14 - targetSdkVersion 28 + minSdkVersion 23 + targetSdkVersion 34 versionCode 1 versionName "1.0" } @@ -19,6 +19,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } } dependencies { diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index ee489c4..7c4eaad 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -11,6 +11,7 @@ android:theme="@style/AppTheme">