Skip to content

Commit a12ec20

Browse files
author
Shrikanth Ravi
authored
Merge pull request #47 from karangoel16/master
Moved to androidx and added gesture for left and right swipe
2 parents 6972955 + 6a4fe71 commit a12ec20

File tree

34 files changed

+1671
-1320
lines changed

34 files changed

+1671
-1320
lines changed

.github/workflows/android.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Android CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v1
12+
- name: set up JDK 1.8
13+
uses: actions/setup-java@v1
14+
with:
15+
java-version: 1.8
16+
- name: Build with Gradle
17+
run: ./gradlew :clean collapsiblecalendarview:assemble

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
/build
88
/captures
99
.externalNativeBuild
10+
/.idea/*
-8 Bytes
Binary file not shown.

.idea/caches/gradle_models.ser

-1.94 KB
Binary file not shown.

.idea/codeStyles/Project.xml

Lines changed: 116 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/markdown-doclet.xml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 18 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

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

app/build.gradle

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
11
apply plugin: 'com.android.application'
2+
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-android-extensions'
24

35

46
android {
5-
compileSdkVersion 27
7+
compileSdkVersion 29
8+
9+
kotlinOptions {
10+
jvmTarget = '1.8'
11+
}
12+
613
defaultConfig {
714
applicationId "com.shrikanthravi.collapsiblecalendarview"
815
minSdkVersion 21
9-
targetSdkVersion 27
16+
targetSdkVersion 29
1017
versionCode 1
1118
versionName "1.0"
12-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
19+
compileOptions {
20+
sourceCompatibility JavaVersion.VERSION_1_8
21+
targetCompatibility JavaVersion.VERSION_1_8
22+
}
23+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1324
}
1425
dexOptions {
1526
preDexLibraries = false
@@ -24,10 +35,14 @@ android {
2435

2536
dependencies {
2637
implementation fileTree(dir: 'libs', include: ['*.jar'])
27-
implementation 'com.android.support:appcompat-v7:27.0.2'
28-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
38+
implementation 'androidx.appcompat:appcompat:1.1.0'
39+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
2940
testImplementation 'junit:junit:4.12'
30-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
31-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
41+
androidTestImplementation 'androidx.test:runner:1.2.0'
42+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
3243
implementation project(':collapsiblecalendarview2')
44+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
45+
}
46+
repositories {
47+
mavenCentral()
3348
}

0 commit comments

Comments
 (0)