Skip to content

Commit cae345d

Browse files
adrielcafeadrielcafe
committed
chore: update dependencies
1 parent 63ac124 commit cae345d

10 files changed

Lines changed: 62 additions & 45 deletions

File tree

‎build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
buildscript {
22
repositories {
33
google()
4-
jcenter()
54
mavenCentral()
6-
maven { url "https://plugins.gradle.org/m2/" }
5+
gradlePluginPortal()
76
}
87
dependencies {
98
ProjectLib.all.forEach { classpath it }
@@ -16,7 +15,6 @@ allprojects {
1615
apply plugin: 'com.github.ben-manes.versions'
1716
repositories {
1817
google()
19-
jcenter()
2018
mavenCentral()
2119
maven { url 'https://jitpack.io' }
2220
}
@@ -28,7 +26,7 @@ allprojects {
2826
}
2927
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
3028
kotlinOptions {
31-
jvmTarget = JavaVersion.VERSION_1_8
29+
jvmTarget = JavaVersion.VERSION_11
3230
}
3331
}
3432
}

‎buildSrc/src/main/kotlin/Dependencies.kt‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
@file:Suppress("Unused", "MayBeConstant", "MemberVisibilityCanBePrivate")
22

33
internal object Version {
4-
const val GRADLE_ANDROID = "3.6.3"
5-
const val GRADLE_DETEKT = "1.7.4"
6-
const val GRADLE_KTLINT = "9.2.1"
4+
const val GRADLE_ANDROID = "7.0.0"
5+
const val GRADLE_DETEKT = "1.17.1"
6+
const val GRADLE_KTLINT = "10.1.0"
77
const val GRADLE_JACOCO = "0.16.0"
8-
const val GRADLE_VERSIONS = "0.28.0"
9-
const val GRADLE_MAVEN = "2.1"
8+
const val GRADLE_VERSIONS = "0.39.0"
109

11-
const val KOTLIN = "1.3.72"
12-
const val COROUTINES = "1.3.6"
13-
const val LIFECYCLE = "2.2.0"
10+
const val KOTLIN = "1.5.21"
11+
const val COROUTINES = "1.5.1"
12+
const val LIFECYCLE = "2.3.1"
1413

1514
// Sample app only
16-
const val KTOR = "1.3.2"
17-
const val SERIALIZATION = "0.20.0"
18-
const val APP_COMPAT = "1.1.0"
19-
const val ACTIVITY = "1.1.0"
20-
21-
const val TEST_JUNIT = "1.1.1"
22-
const val TEST_STRIKT = "0.25.0"
23-
const val TEST_MOCKK = "1.9.3"
15+
const val KTOR = "1.6.2"
16+
const val SERIALIZATION = "1.2.2"
17+
const val APP_COMPAT = "1.3.1"
18+
const val ACTIVITY = "1.3.1"
19+
20+
const val TEST_JUNIT = "1.1.3"
21+
const val TEST_STRIKT = "0.31.0"
22+
const val TEST_MOCKK = "1.12.0"
2423
}
2524

2625
object ProjectLib {
@@ -31,26 +30,24 @@ object ProjectLib {
3130
const val KTLINT = "org.jlleitschuh.gradle:ktlint-gradle:${Version.GRADLE_KTLINT}"
3231
const val JACOCO = "com.vanniktech:gradle-android-junit-jacoco-plugin:${Version.GRADLE_JACOCO}"
3332
const val VERSIONS = "com.github.ben-manes:gradle-versions-plugin:${Version.GRADLE_VERSIONS}"
34-
const val MAVEN = "com.github.dcendents:android-maven-gradle-plugin:${Version.GRADLE_MAVEN}"
3533

36-
val all = setOf(ANDROID, KOTLIN, SERIALIZATION, DETEKT, KTLINT, JACOCO, VERSIONS, MAVEN)
34+
val all = setOf(ANDROID, KOTLIN, SERIALIZATION, DETEKT, KTLINT, JACOCO, VERSIONS)
3735
}
3836

3937
object ModuleLib {
40-
const val KOTLIN = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Version.KOTLIN}"
4138
const val COROUTINES_CORE = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Version.COROUTINES}"
4239
const val COROUTINES_ANDROID = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Version.COROUTINES}"
4340
const val LIVEDATA = "androidx.lifecycle:lifecycle-livedata-ktx:${Version.LIFECYCLE}"
4441

4542
// Sample app only
4643
const val KTOR = "io.ktor:ktor-client-android:${Version.KTOR}"
4744
const val KTOR_SERIALIZATION = "io.ktor:ktor-client-serialization-jvm:${Version.KTOR}"
48-
const val SERIALIZATION = "org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Version.SERIALIZATION}"
45+
const val SERIALIZATION = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Version.SERIALIZATION}"
4946
const val APP_COMPAT = "androidx.appcompat:appcompat:${Version.APP_COMPAT}"
5047
const val ACTIVITY = "androidx.activity:activity-ktx:${Version.ACTIVITY}"
5148
const val VIEWMODEL = "androidx.lifecycle:lifecycle-viewmodel-ktx:${Version.LIFECYCLE}"
5249

53-
val sample = setOf(KOTLIN, COROUTINES_ANDROID, KTOR, KTOR_SERIALIZATION, SERIALIZATION, APP_COMPAT, ACTIVITY, VIEWMODEL)
50+
val sample = setOf(COROUTINES_ANDROID, KTOR, KTOR_SERIALIZATION, SERIALIZATION, APP_COMPAT, ACTIVITY, VIEWMODEL)
5451
}
5552

5653
object TestLib {

‎buildSrc/src/main/kotlin/Maven.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
object Maven {
44

5-
const val GROUP = "com.github.adrielcafe.hal"
5+
const val GROUP_ID = "com.github.adrielcafe.hal"
66
}

‎gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ org.gradle.parallel=true
44
org.gradle.configureondemand=true
55
org.gradle.caching=true
66

7-
android.enableBuildCache=true
87
android.useAndroidX=true
98
android.enableJetifier=true
109

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip

‎hal-core/build.gradle‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
11
apply plugin: 'kotlin'
22
apply plugin: 'com.vanniktech.android.junit.jacoco'
3-
apply plugin: 'maven'
3+
apply plugin: 'maven-publish'
44

5-
group = Maven.GROUP
6-
7-
sourceCompatibility = JavaVersion.VERSION_1_8
8-
targetCompatibility = JavaVersion.VERSION_1_8
5+
sourceCompatibility = JavaVersion.VERSION_11
6+
targetCompatibility = JavaVersion.VERSION_11
97

108
sourceSets {
119
main.java.srcDirs += 'src/main/kotlin/'
1210
}
1311

1412
dependencies {
15-
implementation ModuleLib.KOTLIN
1613
implementation ModuleLib.COROUTINES_CORE
1714

1815
TestLib.all.forEach { testImplementation it }
1916
}
17+
18+
19+
afterEvaluate {
20+
publishing {
21+
publications {
22+
release(MavenPublication) {
23+
from components.java
24+
25+
groupId = Maven.GROUP_ID
26+
artifactId = "hal-core"
27+
}
28+
}
29+
}
30+
}

‎hal-livedata/build.gradle‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'com.github.dcendents.android-maven'
4-
5-
group = Maven.GROUP
3+
apply plugin: 'maven-publish'
64

75
android {
8-
compileSdkVersion 29
6+
compileSdkVersion 30
97
defaultConfig {
108
minSdkVersion 16
11-
targetSdkVersion 29
9+
targetSdkVersion 30
1210
}
1311
sourceSets {
1412
main.java.srcDirs += 'src/main/kotlin/'
1513
}
1614
compileOptions {
17-
sourceCompatibility JavaVersion.VERSION_1_8
18-
targetCompatibility JavaVersion.VERSION_1_8
15+
sourceCompatibility JavaVersion.VERSION_11
16+
targetCompatibility JavaVersion.VERSION_11
1917
}
2018
lintOptions {
2119
abortOnError false
@@ -30,9 +28,21 @@ android {
3028
dependencies {
3129
implementation project(':hal-core')
3230

33-
implementation ModuleLib.KOTLIN
3431
implementation ModuleLib.COROUTINES_ANDROID
3532
implementation ModuleLib.LIVEDATA
3633

3734
TestLib.all.forEach { testImplementation it }
35+
}
36+
37+
afterEvaluate {
38+
publishing {
39+
publications {
40+
release(MavenPublication) {
41+
from components.release
42+
43+
groupId = Maven.GROUP_ID
44+
artifactId = "hal-livedata"
45+
}
46+
}
47+
}
3848
}

‎hal-livedata/src/main/kotlin/cafe/adriel/hal/livedata/observer/LiveDataStateObserver.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class LiveDataStateObserver<S : HAL.State>(
1313
) : HAL.StateObserver<S> {
1414

1515
override fun observe(stateFlow: Flow<S>) {
16-
liveData<S> {
16+
liveData {
1717
stateFlow.collect(::emit)
1818
}.observe(owner, onStateChanged)
1919
}

‎jitpack.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
jdk:
2+
- openjdk11

‎sample/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ apply plugin: 'kotlin-android-extensions'
44
apply plugin: 'kotlinx-serialization'
55

66
android {
7-
compileSdkVersion 29
7+
compileSdkVersion 30
88
defaultConfig {
99
applicationId "cafe.adriel.hal.sample"
1010
minSdkVersion 16
11-
targetSdkVersion 29
11+
targetSdkVersion 30
1212
versionCode 1
1313
versionName "1.0"
1414
}

0 commit comments

Comments
 (0)