Skip to content
This repository has been archived by the owner on Jun 18, 2021. It is now read-only.

Commit

Permalink
Merge branch 'release/0.0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
JonasWanke committed Aug 19, 2018
2 parents 3ef1f3a + 2d8dd58 commit 6f68910
Show file tree
Hide file tree
Showing 34 changed files with 1,075 additions and 317 deletions.
44 changes: 44 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
language: android
jdk: oraclejdk8
sudo: false

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
cache:
directories:
- $HOME/.gradle/daemon
- $HOME/.gradle/native
- $HOME/.gradle/wrapper

android:
components:
- platform-tools
- tools
- build-tools-28.0.2
- android-28
- extra-android-m2repository
- extra-google-m2repository
- extra-android-support
- extra-google-google_play_services

before_install:
- mkdir "$ANDROID_HOME/licenses" || true
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
- chmod +x gradlew
install:
- bundle install --without documentation

script:
- ./gradlew --stacktrace :calendar:check :example:check detektCheck
- bundle exec danger --verbose
# - ./gradlew build connectedCheck
- ./gradlew clean build

deploy:
provider: script
script: ./gradlew :clean :calendar:assembleRelease :calendar:bintrayUpload
skip_cleanup: true
dry_run: false
on:
branch: master
13 changes: 9 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,19 @@ Optional intro comment.
-->

## [Unreleased] - estimated 2018-08-26

## [Unreleased] - 2018-xx-xx



## [0.0.5] - 2018-08-19

## [0.0.4] - 2018-xx-xx
- Added: Add CI ([#45](https://github.com/JonasWanke/com.jonaswanke.calendar/pull/45)), fixes [#35](https://github.com/JonasWanke/com.jonaswanke.calendar/issues/35)
- Changed: Stack events if title is readable ([#47](https://github.com/JonasWanke/com.jonaswanke.calendar/pull/47)), fixes [#34](https://github.com/JonasWanke/com.jonaswanke.calendar/issues/34)
- Fixed: Correctly show multiday/-week events ([#48](https://github.com/JonasWanke/com.jonaswanke.calendar/pull/48)), fixes [#46](https://github.com/JonasWanke/com.jonaswanke.calendar/issues/46)

Optional intro comment.

## [0.0.4] - 2018-08-14

- Added: Support all-day events ([#41](https://github.com/JonasWanke/com.jonaswanke.calendar/pull/41)), fixes [#9](https://github.com/JonasWanke/com.jonaswanke.calendar/issues/9)
- Added: Support creating events ([#44](https://github.com/JonasWanke/com.jonaswanke.calendar/pull/44)), fixes [#37](https://github.com/JonasWanke/com.jonaswanke.calendar/issues/37)
Expand Down Expand Up @@ -63,7 +67,8 @@ Optional intro comment.
Initial release supporting week view.


[Unreleased]: https://github.com/JonasWanke/com.jonaswanke.calendar/compare/v0.0.4...dev
[Unreleased]: https://github.com/JonasWanke/com.jonaswanke.calendar/compare/v0.0.5...dev
[0.0.5]: https://github.com/JonasWanke/com.jonaswanke.calendar/compare/v0.0.4...v0.0.5
[0.0.4]: https://github.com/JonasWanke/com.jonaswanke.calendar/compare/v0.0.3...v0.0.4
[0.0.3]: https://github.com/JonasWanke/com.jonaswanke.calendar/compare/v0.0.2...v0.0.3
[0.0.2]: https://github.com/JonasWanke/com.jonaswanke.calendar/compare/v0.0.1...v0.0.2
21 changes: 21 additions & 0 deletions Dangerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# github comment settings
#github.dismiss_out_of_range_messages

# for PR
if github.pr_title.include?('[WIP]') || github.pr_labels.include?('PR: wip')
warn('PR is classed as Work in Progress')
end

# Warn when there is a big PR
warn('a large PR') if git.lines_of_code > 500

# detekt
checkstyle_format.base_path = Dir.pwd
checkstyle_format.report 'build/reports/detekt/detekt-checkstyle.xml'

# AndroidLint
android_lint.severity = "Error"
android_lint.report_file = "calendar/build/reports/lint-results.xml"
android_lint.lint(inline_mode: true)
android_lint.report_file = "example/build/reports/lint-results.xml"
android_lint.lint(inline_mode: true)
6 changes: 6 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# frozen_string_literal: true
source "http://rubygems.org"

gem 'danger'
gem 'danger-checkstyle_format'
gem 'danger-android_lint'
72 changes: 72 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
GEM
remote: http://rubygems.org/
specs:
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
ast (2.4.0)
claide (1.0.2)
claide-plugins (0.9.2)
cork
nap
open4 (~> 1.3)
colored2 (3.1.2)
cork (0.3.0)
colored2 (~> 3.1)
danger (5.6.4)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
cork (~> 0.1)
faraday (~> 0.9)
faraday-http-cache (~> 1.0)
git (~> 1)
kramdown (~> 1.5)
no_proxy_fix
octokit (~> 4.7)
terminal-table (~> 1)
danger-android_lint (0.0.6)
danger-plugin-api (~> 1.0)
oga
danger-checkstyle_format (0.1.1)
danger-plugin-api (~> 1.0)
ox (~> 2.0)
danger-plugin-api (1.0.0)
danger (> 2.0)
faraday (0.15.2)
multipart-post (>= 1.2, < 3)
faraday-http-cache (1.3.1)
faraday (~> 0.8)
git (1.5.0)
kramdown (1.17.0)
multipart-post (2.0.0)
nap (1.1.0)
no_proxy_fix (0.1.2)
octokit (4.10.0)
sawyer (~> 0.8.0, >= 0.5.3)
oga (2.15)
ast
ruby-ll (~> 2.1)
open4 (1.3.4)
ox (2.9.4)
public_suffix (3.0.3)
ruby-ll (2.1.2)
ansi
ast
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
unicode-display_width (1.4.0)

PLATFORMS
x64-mingw32

DEPENDENCIES
danger
danger-android_lint
danger-checkstyle_format

BUNDLED WITH
1.16.3
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# CalendarView

[![GitHub version](https://img.shields.io/github/release/JonasWanke/com.jonaswanke.calendar/all.svg?colorB=4c1)](https://github.com/JonasWanke/com.jonaswanke.calendar/releases)
[![Build Status](https://travis-ci.com/JonasWanke/com.jonaswanke.calendar.svg?branch=dev)](https://travis-ci.com/JonasWanke/com.jonaswanke.calendar)
[![Bintray](https://img.shields.io/bintray/v/jonaswanke/maven/calendar.svg)](https://bintray.com/jonaswanke/maven/calendar)

[![Apache 2.0 license](https://img.shields.io/badge/license-Apache%202.0-green.svg?colorB=4c1)](http://www.apache.org/licenses/LICENSE-2.0)
[![Semver](https://img.shields.io/badge/Semver-2.0.0-green.svg?colorB=4c1)](https://semver.org/spec/v2.0.0.html)
[![Awesome Badges](https://img.shields.io/badge/badges-awesome-green.svg?colorB=4c1)](https://github.com/Naereen/badges)


Expand All @@ -26,7 +27,7 @@ This library provides a Material Design CalendarView for Android (week view; mor
1. Import the library

```groovy
implementation 'com.jonaswanke.calendar:calendar:0.0.4'
implementation 'com.jonaswanke.calendar:calendar:0.0.5'
```

2. Add CalendarView in you layout
Expand Down
29 changes: 27 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,43 @@
buildscript {
ext.kotlin_version = '1.2.51'
ext {
kotlinVersion = '1.2.51'
buildToolsVersion = '28.0.2'
minSdkVersion = 16
targetSdkVersion = 28
compileSdkVersion = 28

versionName = '0.0.5'
versionCode = 5

detektVersion = "1.0.0.RC8"
}
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0-beta05'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"

classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
}
}

plugins {
id "io.gitlab.arturbosch.detekt" version "1.0.0.RC8"
}

detekt {
version = detektVersion
profile("main") {
input = "$projectDir"
config = "$rootDir/detekt.yml"
filters = ".*test.*,.*/resources/.*,.*/tmp/.*"
output = "$projectDir/build/reports/detekt"
}
}

allprojects {
repositories {
google()
Expand Down
54 changes: 18 additions & 36 deletions calendar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,22 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

apply from: rootProject.file('gradle-bintray-push.gradle')

kotlin.experimental.coroutines "enable"

android {
compileSdkVersion 28
buildToolsVersion rootProject.buildToolsVersion
compileSdkVersion rootProject.compileSdkVersion

defaultConfig {
minSdkVersion 16
targetSdkVersion 28
versionCode 4
versionName "0.0.4"
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
versionName rootProject.versionName
versionCode rootProject.versionCode

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
Expand All @@ -22,11 +26,18 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

lintOptions {
abortOnError false
absolutePaths false
xmlReport true
lintConfig file("lint.xml")
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:0.22.5"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.22.3"

Expand All @@ -40,32 +51,3 @@ dependencies {
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
}

ext {
bintrayRepo = 'maven'
bintrayName = 'calendar'

publishedGroupId = 'com.jonaswanke.calendar'
libraryName = 'Calendar'
artifact = 'calendar'

libraryDescription = 'Material Design CalendarView for Android'

siteUrl = 'https://github.com/JonasWanke/com.jonaswanke.calendar'
gitUrl = 'https://github.com/JonasWanke/com.jonaswanke.calendar.git'
githubRepository = 'JonasWanke/com.jonaswanke.calendar'

libraryVersion = '0.0.4'

developerId = 'JonasWanke'
developerName = 'Jonas Wanke'
developerEmail = '[email protected]'

licenseName = 'The Apache Software License, Version 2.0'
licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
allLicenses = ["Apache-2.0"]
}

apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
apply from: rootProject.file('gradle-bintray-push.gradle')
5 changes: 5 additions & 0 deletions calendar/lint.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>


</lint>
Loading

0 comments on commit 6f68910

Please sign in to comment.