Skip to content

Commit

Permalink
Merge branch 'release/2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
chrimaeon committed Oct 13, 2019
2 parents 13a2b27 + cf62ecd commit ee6bfca
Show file tree
Hide file tree
Showing 69 changed files with 1,619 additions and 760 deletions.
49 changes: 49 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
version: 2.1

executors:
app-rater-android-executor:
docker:
- image: circleci/android:api-29
working_directory: ~/app-rater
environment:
JAVA_TOOL_OPTIONS: "-Xmx1536m"
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
TERM: dumb

commands:
store-app-rater-artifacts:
description: "It stores Lint & Test Artifacts"
parameters:
artifact-path:
type: string
steps:
- store_artifacts:
path: <<parameters.artifact-path>>
store-app-rater-test-results:
description: "It stores Test Results"
parameters:
test-result-path:
type: string
steps:
- store_test_results:
path: <<parameters.test-result-path>>

jobs:
build:
executor: app-rater-android-executor
steps:
- checkout
- run:
name: Download Dependencies
command: ./gradlew dependencies
- run:
name: Run JVM Tests & Lint
command: ./gradlew check
- run:
name: Gather Lint & Test results
command: python ./scripts/copy_results
- store-app-rater-artifacts:
artifact-path: ci_results/lint
- store-app-rater-test-results:
test-result-path: ci_results/test

7 changes: 7 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[*]
insert_final_newline = true
indent_style = space

[*.{kt, kts}]
indent_size = 4
disabled_rules = import-ordering
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
*.iml
.gradle
/local.properties
/.idea
/.idea/*
!/.idea/codeStyles/
!/.idea/copyright/
.DS_Store
build/
/captures
Expand Down
168 changes: 168 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/copyright/CMG_Apps.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Apache License
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Android&trade; App Rater Dialog

[![License](https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg?style=for-the-badge&logo=apache)](http://www.apache.org/licenses/LICENSE-2.0)
[![Bintray](https://img.shields.io/bintray/v/chrimaeon/maven/com.cmgapps.android:app-rater.svg?style=for-the-badge)](https://jcenter.bintray.com/com/cmgapps/android/cmgUtilities/)
[![Bintray](https://www.cmgapps.com/badge/chrimaeon/maven/com.cmgapps.android:app-rater/badge.svg)](https://jcenter.bintray.com/com/cmgapps/android/cmgUtilities/)
[![CircleCI](https://circleci.com/gh/chrimaeon/app-rater.svg?style=svg)](https://circleci.com/gh/chrimaeon/app-rater)

This is a App Rater Dialog to encourage user to rate the app on the Google Play Store&trade;

Expand All @@ -11,7 +12,6 @@ It is used in my Android&trade; Projects:
* [Numerals Converter][4]
* [PhoNews][2]
* [PhoNews Pro][3]
* [Running Sushi][5]

## Usage

Expand Down Expand Up @@ -88,4 +88,3 @@ limitations under the License.
[2]: https://play.google.com/store/apps/details?id=at.cmg.android.phonews&referrer=utm_source%3Dgithub%26utm_medium%3DREADME
[3]: https://play.google.com/store/apps/details?id=com.cmgapps.android.phonewspro&referrer=utm_source%3Dgithub%26utm_medium%3DREADME
[4]: https://play.google.com/store/apps/details?id=com.cmgapps.android.numeralsconverter&referrer=utm_source%3Dgithub%26utm_medium%3DREADME
[5]: https://play.google.com/store/apps/details?id=com.cmgapps.android.sushicounter&referrer=utm_source%3Dgithub%26utm_medium%3DREADME
62 changes: 59 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask

/*
* Copyright (c) 2019. Christian Grach <christian.grach@cmgapps.com>
*
Expand All @@ -22,11 +24,15 @@ buildscript {

}
dependencies {
classpath("com.android.tools.build:gradle:3.4.0")
classpath("com.android.tools.build:gradle:3.5.1")
classpath(kotlin("gradle-plugin", version = Deps.Versions.KOTLIN))
}
}

plugins {
id("com.github.ben-manes.versions") version "0.25.0"
}

allprojects {
repositories {
jcenter()
Expand All @@ -35,6 +41,56 @@ allprojects {
}
}

tasks.create<Delete>("clean") {
delete(rootProject.buildDir)

subprojects {
val ktlint by configurations.creating

tasks {
val ktlint by registering(JavaExec::class) {
group = "Verification"
description = "Check Kotlin code style."
main = "com.pinterest.ktlint.Main"
classpath = ktlint
args = listOf(
"src/**/*.kt",
"--reporter=plain",
"--reporter=checkstyle,output=${buildDir}/reports/ktlint.xml"
)

}

afterEvaluate {
named("check") {
dependsOn(ktlint)
}
}

withType<Test> {
testLogging {
events("passed", "skipped", "failed")
}
}
}

dependencies {
ktlint("com.pinterest:ktlint:0.34.2")
}

}

tasks {
withType<DependencyUpdatesTask> {
revision = "release"
rejectVersionIf {
listOf("alpha", "beta", "rc", "cr", "m", "preview", "b", "ea").any { qualifier ->
candidate.version.matches(Regex("(?i).*[.-]$qualifier[.\\d-+]*"))
}
}
}

register<Delete>("clean") {
delete(rootProject.buildDir)
}
}


6 changes: 5 additions & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ plugins {
}

repositories {
google()
jcenter()
}

dependencies {
implementation(kotlin("stdlib-jdk8", "1.3.31"))
implementation(kotlin("stdlib-jdk8", "1.3.50"))
implementation("com.android.tools.build:gradle:3.5.1")
implementation("digital.wup:android-maven-publish:3.6.2")
implementation("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4")
}
Loading

0 comments on commit ee6bfca

Please sign in to comment.