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

Commit

Permalink
2020-03-04 Version 1.1.0: Updated Gradle and Gradle plugin, badges in…
Browse files Browse the repository at this point in the history
… README.md, Git ignore rules in .gitignore
  • Loading branch information
fartem committed Mar 4, 2020
1 parent a08fd17 commit b12e7fa
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 25 deletions.
15 changes: 4 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,12 @@ proguard/
captures/

# IntelliJ
/.idea/
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
.idea/caches

# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
#*.jks
#*.keystore
*.jks
*.keystore

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
Expand All @@ -67,4 +60,4 @@ fastlane/test_output
fastlane/readme.md

# OSX files
.DS_Store
.DS_Store
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
Android Remote Temperature Control Client
=============

![Travis CI](https://img.shields.io/travis/fartem/android-remote-temperature-control-client)
![Codecov](https://img.shields.io/codecov/c/github/fartem/android-remote-temperature-control-client)
[![Travis CI](https://img.shields.io/travis/fartem/android-remote-temperature-control-client)](https://travis-ci.org/fartem/android-remote-temperature-control-client)
[![Codecov](https://img.shields.io/codecov/c/github/fartem/android-remote-temperature-control-client)](https://codecov.io/gh/fartem/android-remote-temperature-control-client)
[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Android%20Home%20Control%20Client-brightgreen.svg?style=flat)](https://android-arsenal.com/details/3/7943)
![Open issues](https://img.shields.io/github/issues-raw/fartem/android-remote-temperature-control-client.svg?color=ff534a)
[![Open issues](https://img.shields.io/github/issues-raw/fartem/android-remote-temperature-control-client.svg?color=ff534a)](https://github.com/fartem/android-remote-temperature-control-client/issues)

About
-------------
Expand Down
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,32 @@ apply from: 'jacoco.gradle'

android {
compileSdkVersion 29
buildToolsVersion "29.0.2"
buildToolsVersion'29.0.2'
defaultConfig {
applicationId "com.smlnskgmail.jaman.remotetemperaturecontrol"
applicationId 'com.smlnskgmail.jaman.remotetemperaturecontrol'
minSdkVersion 21
targetSdkVersion 29
versionCode 1
versionName "1.3.0"
versionName '1.3.0'

buildConfigField "String", "API_IMPL", "\"\""
buildConfigField 'String', 'API_IMPL', "\"\""
}
productFlavors {
devicebt {
flavorDimensions "build"
flavorDimensions 'build'

buildConfigField "String", "API_IMPL", "\"DEVICE_BT\""
buildConfigField 'String', 'API_IMPL', "\"DEVICE_BT\""
}
debugbt {
flavorDimensions "build"

buildConfigField "String", "API_IMPL", "\"DEBUG_BT\""
buildConfigField 'String', 'API_IMPL', "\"DEBUG_BT\""
}
}
}

dependencies {
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ buildscript {

}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.android.tools.build:gradle:3.6.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "de.aaschmid:gradle-cpd-plugin:3.1"
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
}
}

plugins {
id "io.gitlab.arturbosch.detekt" version "1.2.2"
id 'io.gitlab.arturbosch.detekt' version '1.2.2'
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 comments on commit b12e7fa

Please sign in to comment.