Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
adrielcafe committed Aug 14, 2021
1 parent 3e790d6 commit 30b63ca
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 37 deletions.
22 changes: 17 additions & 5 deletions broker-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,30 @@
apply plugin: 'kotlin'
apply plugin: 'com.vanniktech.android.junit.jacoco'
apply plugin: 'maven'

group = Maven.GROUP_ID
apply plugin: 'maven-publish'

compileKotlin {
kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
}

compileTestKotlin {
kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
}

dependencies {
ModuleLib.brokerCore.forEach { implementation it }

TestLib.all.forEach { testImplementation it }
}

afterEvaluate {
publishing {
publications {
release(MavenPublication) {
from components.java

groupId = Maven.GROUP_ID
artifactId = "broker-core"
}
}
}
}
23 changes: 18 additions & 5 deletions broker-lifecycle/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'maven-publish'

android {
compileSdkVersion 29
compileSdkVersion 30
defaultConfig {
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 30
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
}

Expand All @@ -21,3 +21,16 @@ dependencies {

TestLib.all.forEach { testImplementation it }
}

afterEvaluate {
publishing {
publications {
release(MavenPublication) {
from components.release

groupId = Maven.GROUP_ID
artifactId = "broker-lifecycle"
}
}
}
}
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ apply plugin: "com.github.ben-manes.versions"
buildscript {
repositories {
google()
jcenter()
maven { url "https://plugins.gradle.org/m2/" }
mavenCentral()
gradlePluginPortal()
}
dependencies {
ProjectLib.all.forEach { classpath it }
Expand All @@ -24,12 +24,12 @@ allprojects {
}
repositories {
google()
jcenter()
mavenCentral()
maven { url 'https://jitpack.io' }
}
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
jvmTarget = JavaVersion.VERSION_11
}
}
}
Expand Down
30 changes: 14 additions & 16 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
@file:Suppress("Unused", "MayBeConstant", "MemberVisibilityCanBePrivate")

internal object Version {
const val GRADLE_ANDROID = "4.0.1"
const val GRADLE_DETEKT = "1.7.4"
const val GRADLE_KTLINT = "9.2.1"
const val GRADLE_ANDROID = "7.0.0"
const val GRADLE_DETEKT = "1.17.1"
const val GRADLE_KTLINT = "10.1.0"
const val GRADLE_JACOCO = "0.16.0"
const val GRADLE_VERSIONS = "0.28.0"
const val GRADLE_MAVEN = "2.1"
const val GRADLE_VERSIONS = "0.39.0"

const val KOTLIN = "1.3.72"
const val COROUTINES = "1.3.8"
const val KOTLIN = "1.5.21"
const val COROUTINES = "1.5.1"

const val APP_COMPAT = "1.1.0"
const val ACTIVITY = "1.1.0"
const val LIFECYCLE = "2.2.0"
const val LEAK_CANARY = "2.2"
const val APP_COMPAT = "1.3.1"
const val ACTIVITY = "1.3.1"
const val LIFECYCLE = "2.3.1"
const val LEAK_CANARY = "2.7"

const val TEST_JUNIT = "1.1.1"
const val TEST_STRIKT = "0.25.0"
const val TEST_MOCKK = "1.9.3"
const val TEST_JUNIT = "1.1.3"
const val TEST_STRIKT = "0.31.0"
const val TEST_MOCKK = "1.12.0"
}

object ProjectLib {
Expand All @@ -28,9 +27,8 @@ object ProjectLib {
const val KTLINT = "org.jlleitschuh.gradle:ktlint-gradle:${Version.GRADLE_KTLINT}"
const val JACOCO = "com.vanniktech:gradle-android-junit-jacoco-plugin:${Version.GRADLE_JACOCO}"
const val VERSIONS = "com.github.ben-manes:gradle-versions-plugin:${Version.GRADLE_VERSIONS}"
const val MAVEN = "com.github.dcendents:android-maven-gradle-plugin:${Version.GRADLE_MAVEN}"

val all = setOf(ANDROID, KOTLIN, DETEKT, KTLINT, JACOCO, VERSIONS, MAVEN)
val all = setOf(ANDROID, KOTLIN, DETEKT, KTLINT, JACOCO, VERSIONS)
}

object ModuleLib {
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ org.gradle.parallel=true
org.gradle.configureondemand=true
org.gradle.caching=true

android.enableBuildCache=true
android.useAndroidX=true
android.enableJetifier=true

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 @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
2 changes: 2 additions & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
jdk:
- openjdk11
10 changes: 5 additions & 5 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 29
compileSdkVersion 30
defaultConfig {
applicationId "cafe.adriel.broker.sample"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 30
versionCode 1
versionName "1.0"
}
Expand All @@ -18,11 +18,11 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
jvmTarget = JavaVersion.VERSION_11.toString()
}
packagingOptions {
exclude 'META-INF/*'
Expand Down

0 comments on commit 30b63ca

Please sign in to comment.