Skip to content

Commit

Permalink
3.7.1.30
Browse files Browse the repository at this point in the history
  • Loading branch information
angcyo committed May 7, 2022
1 parent f98b3bc commit 50efc25
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 29 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ allprojects {
## 加入依赖

```
implementation 'com.github.angcyo:CalendarView:3.7.1.29'
implementation 'com.github.angcyo:CalendarView:3.7.1.30'
```

### `垂直滚动日历`使用方式
Expand Down
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 30
compileSdkVersion 31
//noinspection GradleDependency
defaultConfig {
applicationId "com.haibin.calendarviewproject"
minSdkVersion 15
//noinspection OldTargetApi
targetSdkVersion 30
targetSdkVersion 31
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -27,11 +27,11 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})

implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.appcompat:appcompat:1.4.1'

implementation 'com.google.android.material:material:1.3.0'
implementation 'com.google.android.material:material:1.6.0'

implementation 'com.github.bumptech.glide:glide:4.11.0'
implementation 'com.github.bumptech.glide:glide:4.13.1'

testImplementation 'junit:junit:4.13.2'
implementation project(':calendarview')
Expand Down
72 changes: 54 additions & 18 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,67 @@
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
<activity android:name=".MainActivity">
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity android:name=".meizu.MeiZuActivity" />
<activity android:name=".multi.MultiActivity" />
<activity android:name=".index.IndexActivity" />
<activity android:name=".simple.SimpleActivity" />
<activity android:name=".range.RangeActivity" />
<activity android:name=".colorful.ColorfulActivity" />
<activity android:name=".solay.SolarActivity" />
<activity android:name=".single.SingleActivity" />
<activity android:name=".progress.ProgressActivity" />
<activity android:name=".custom.CustomActivity" />
<activity android:name=".mix.MixActivity" />
<activity android:name=".pager.ViewPagerActivity" />
<activity android:name=".full.FullActivity" />
<activity android:name=".TestActivity" />
<activity android:name=".CalendarActivity" />
<activity android:name=".VerticalActivity" />
<activity android:name=".mark.SimpleMarkActivity" />
<activity
android:name=".meizu.MeiZuActivity"
android:exported="true" />
<activity
android:name=".multi.MultiActivity"
android:exported="true" />
<activity
android:name=".index.IndexActivity"
android:exported="true" />
<activity
android:name=".simple.SimpleActivity"
android:exported="true" />
<activity
android:name=".range.RangeActivity"
android:exported="true" />
<activity
android:name=".colorful.ColorfulActivity"
android:exported="true" />
<activity
android:name=".solay.SolarActivity"
android:exported="true" />
<activity
android:name=".single.SingleActivity"
android:exported="true" />
<activity
android:name=".progress.ProgressActivity"
android:exported="true" />
<activity
android:name=".custom.CustomActivity"
android:exported="true" />
<activity
android:name=".mix.MixActivity"
android:exported="true" />
<activity
android:name=".pager.ViewPagerActivity"
android:exported="true" />
<activity
android:name=".full.FullActivity"
android:exported="true" />
<activity
android:name=".TestActivity"
android:exported="true" />
<activity
android:name=".CalendarActivity"
android:exported="true" />
<activity
android:name=".VerticalActivity"
android:exported="true" />
<activity
android:name=".mark.SimpleMarkActivity"
android:exported="true" />
</application>

</manifest>
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
dependencies {
//noinspection GradleDependency
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.android.tools.build:gradle:4.2.2'
//classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
//classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
Expand Down
8 changes: 4 additions & 4 deletions calendarview/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 30
compileSdkVersion 31

defaultConfig {
minSdkVersion 14
//noinspection OldTargetApi
targetSdkVersion 30
targetSdkVersion 31
versionCode 371
versionName "3.7.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -39,8 +39,8 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})

implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.recyclerview:recyclerview:1.2.0'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
testImplementation 'junit:junit:4.13.2'
}
//apply from: '../script/gradle-jcenter-push.gradle'

0 comments on commit 50efc25

Please sign in to comment.