Skip to content

Commit

Permalink
Merge pull request #79 from infinum/develop
Browse files Browse the repository at this point in the history
Update stable dependencies
  • Loading branch information
bojankoma authored Feb 11, 2021
2 parents 950715b + 7c3bc32 commit a074499
Show file tree
Hide file tree
Showing 20 changed files with 325 additions and 135 deletions.
40 changes: 34 additions & 6 deletions .github/workflows/code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,55 @@ on:
- '*'

jobs:
checkout:
name: Code analysis
detekt:
name: Detekt
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1

- name: Save Gradle Caches
uses: actions/cache@v2
with:
path: ~/.gradle/caches/
key: gradle-caches-${{ runner.os }}
restore-keys: |
gradle-caches-${{ runner.os }}
- name: Detekt
run: ./gradlew detektAll
- name: Stop Gradle
run: ./gradlew --stop

ktlint:
name: ktlint
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Save Gradle Caches
uses: actions/cache@v2
with:
path: ~/.gradle/caches/
key: gradle-caches-${{ runner.os }}
restore-keys: |
gradle-caches-${{ runner.os }}
- name: ktlint
run: ./gradlew ktlintAll
- name: Stop Gradle
run: ./gradlew --stop
cpd:
name: CPD
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Save Gradle Caches
uses: actions/cache@v2
with:
path: ~/.gradle/caches/
key: gradle-caches-${{ runner.os }}
restore-keys: |
gradle-caches-${{ runner.os }}
- name: CPD
run: ./gradlew cpdAll

- name: Stop Gradle
run: ./gradlew --stop
run: ./gradlew --stop
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ atlassian-ide-plugin.xml
# generated by Crashlytics plugin (for Android Studio and Intellij)
com_crashlytics_export_strings.xml

bintray.properties

publish.properties
*.gpg

6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog
=========

## Version 5.2.4

_2021-02-11_

* Update more dependencies to stable versions.

## Version 5.2.3

_2021-02-03_
Expand Down
18 changes: 7 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[ ![Download](https://api.bintray.com/packages/infinum/android/dbinspector/images/download.svg) ](https://bintray.com/infinum/android/dbinspector/_latestVersion) ![Validate Gradle Wrapper](https://github.com/infinum/android_dbinspector/workflows/Validate%20Gradle%20Wrapper/badge.svg) ![Code analysis](https://github.com/infinum/android_dbinspector/workflows/Code%20analysis/badge.svg)
![Download](https://img.shields.io/maven-central/v/com.infinum.dbinspector/dbinspector) ![Validate Gradle Wrapper](https://github.com/infinum/android_dbinspector/workflows/Validate%20Gradle%20Wrapper/badge.svg) ![Code analysis](https://github.com/infinum/android_dbinspector/workflows/Code%20analysis/badge.svg)

### <img align="left" src="logo.svg" width="48">
# DbInspector
Expand Down Expand Up @@ -26,19 +26,15 @@ To include _DbInspector_ in your project, you have to add buildscript dependenci
```groovy
buildscript {
repositories {
jcenter()
// or ...
maven { url "https://dl.bintray.com/infinum/android" }
mavenCentral()
}
}
```
**KotlinDSL**
```kotlin
buildscript {
repositories {
jcenter()
// or ...
maven(url = "https://dl.bintray.com/infinum/android")
mavenCentral()
}
}
```
Expand All @@ -47,13 +43,13 @@ Then add the following dependencies in your app `build.gradle` or `build.gradle.

**Groovy**
```groovy
debugImplementation "com.infinum.dbinspector:dbinspector:5.2.3"
releaseImplementation "com.infinum.dbinspector:dbinspector-no-op:5.2.3"
debugImplementation "com.infinum.dbinspector:dbinspector:5.2.4"
releaseImplementation "com.infinum.dbinspector:dbinspector-no-op:5.2.4"
```
**KotlinDSL**
```kotlin
debugImplementation("com.infinum.dbinspector:dbinspector:5.2.3")
releaseImplementation("com.infinum.dbinspector:dbinspector-no-op:5.2.3")
debugImplementation("com.infinum.dbinspector:dbinspector:5.2.4")
releaseImplementation("com.infinum.dbinspector:dbinspector-no-op:5.2.4")
```

### Usage
Expand Down
41 changes: 20 additions & 21 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@ buildscript {
"buildTools": "30.0.3"
]

apply from: "maven.gradle"
apply from: "dependencies.gradle"

repositories {
google()
maven { url "https://dl.bintray.com/infinum/android" }
jcenter()
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath packages.gradle
classpath packages.bintray
classpath packages.kotlin.plugin
classpath packages.cpd.plugin
classpath packages.detekt.plugin
Expand All @@ -32,9 +31,17 @@ allprojects {

repositories {
google()
maven { url "https://dl.bintray.com/infinum/android" }
jcenter()
maven { url "https://jitpack.io" }
mavenCentral()
jcenter() {
content {
includeModule("com.soywiz.korlibs.korte", "korte-jvm")
includeModule("org.jetbrains.trove4j", "trove4j")
includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm")
includeGroup("org.jetbrains.dokka")
includeGroup("org.jetbrains")
includeGroup("org.koin")
}
}
}

def buildProperties = new Properties()
Expand All @@ -52,19 +59,15 @@ allprojects {
}

subprojects {
repositories {
google()
maven { url "https://dl.bintray.com/infinum/android" }
jcenter()
mavenCentral()
}

apply from: "../cpd.gradle"
apply from: "../detekt.gradle"
apply from: "../ktlint.gradle"
apply from: "../dokka.gradle"
apply from: "$rootDir/cpd.gradle"
apply from: "$rootDir/detekt.gradle"
apply from: "$rootDir/ktlint.gradle"
apply from: "$rootDir/dokka.gradle"
}

apply from: "shared.gradle"
apply from: "deploy.gradle"

tasks.withType(JavaCompile) {
options.compilerArgs += ["--release", "8"]
}
Expand Down Expand Up @@ -97,8 +100,6 @@ task cpdAll(dependsOn: [
description = "Run cpdCheck on all modules"
}

apply from: "shared.gradle"

task runStaticChecks(dependsOn: ordered(
':detektAll',
':ktlintAll',
Expand All @@ -107,5 +108,3 @@ task runStaticChecks(dependsOn: ordered(
group = "Verification"
description = "Run static checks on all modules"
}

apply from: "deploy.gradle"
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package com.infinum.maven

import com.infinum.maven.shared.BaseConfiguration

class BintrayConfiguration implements BaseConfiguration {

private Properties properties = new Properties()

@Override
void load() {
File file = new File("publish.properties")
if (file.exists()) {
properties.load(new FileInputStream(file))
} else {
properties.setProperty("bintray.name", "")
properties.setProperty("bintray.url", "")
properties.setProperty("bintray.user", "")
properties.setProperty("bintray.apikey", "")
}
}

@Override
String name() {
return properties.getProperty("bintray.name").toString()
}

@Override
String url() {
return properties.getProperty("bintray.url").toString()
}

@Override
String username() {
return properties.getProperty("bintray.user").toString()
}

@Override
String password() {
return properties.getProperty("bintray.apikey").toString()
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package com.infinum.maven

import com.infinum.maven.shared.BaseConfiguration

class GithubConfiguration implements BaseConfiguration {

private Properties properties = new Properties()

@Override
void load() {
File file = new File("publish.properties")
if (file.exists()) {
properties.load(new FileInputStream(file))
} else {
properties.setProperty("github.name", "")
properties.setProperty("github.url", "")
properties.setProperty("github.user", "")
properties.setProperty("github.token", "")
}
}

@Override
String name() {
return properties.getProperty("github.name").toString()
}

@Override
String url() {
return properties.getProperty("github.url").toString()
}

@Override
String username() {
return properties.getProperty("github.user").toString()
}

@Override
String password() {
return properties.getProperty("github.token").toString()
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package com.infinum.maven

import com.infinum.maven.shared.BaseConfiguration

class SonatypeConfiguration implements BaseConfiguration {

private Properties properties = new Properties()

@Override
void load() {
File file = new File("publish.properties")
if (file.exists()) {
properties.load(new FileInputStream(file))
} else {
properties.setProperty("sonatype.name", "")
properties.setProperty("sonatype.url", "")
properties.setProperty("sonatype.user", "")
properties.setProperty("sonatype.password", "")
}
}

@Override
String name() {
return properties.getProperty("sonatype.name").toString()
}

@Override
String url() {
return properties.getProperty("sonatype.url").toString()
}

@Override
String username() {
return properties.getProperty("sonatype.user").toString()
}

@Override
String password() {
return properties.getProperty("sonatype.password").toString()
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.infinum.maven.shared

interface BaseConfiguration {

void load()

String name()

String url()

String username()

String password()
}
2 changes: 1 addition & 1 deletion cpd.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ cpdCheck {
xml.enabled = true
}
source = allprojects*.file("src/main/kotlin")
}
}
2 changes: 1 addition & 1 deletion dbinspector-no-op/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ dependencies {
implementation packages.kotlin.core
}

apply from: "bintray.gradle"
apply from: "publish.gradle"
Loading

0 comments on commit a074499

Please sign in to comment.