chore: update dependencies

Author: adrielcafe

build.gradle

@@ -1,9 +1,8 @@
 buildscript {
     repositories {
         google()
-        jcenter()
         mavenCentral()
-        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
     }
     dependencies {
         ProjectLib.all.forEach { classpath it }
@@ -16,7 +15,6 @@ allprojects {
     apply plugin: 'com.github.ben-manes.versions'
     repositories {
         google()
-        jcenter()
         mavenCentral()
         maven { url 'https://jitpack.io' }
     }
@@ -28,7 +26,7 @@ allprojects {
     }
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
         kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_1_8
+            jvmTarget = JavaVersion.VERSION_11
         }
     }
 }

buildSrc/src/main/kotlin/Dependencies.kt

@@ -1,26 +1,25 @@
 @file:Suppress("Unused", "MayBeConstant", "MemberVisibilityCanBePrivate")
 
 internal object Version {
-    const val GRADLE_ANDROID = "3.6.3"
-    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.6"
-    const val LIFECYCLE = "2.2.0"
+    const val KOTLIN = "1.5.21"
+    const val COROUTINES = "1.5.1"
+    const val LIFECYCLE = "2.3.1"
 
     // Sample app only
-    const val KTOR = "1.3.2"
-    const val SERIALIZATION = "0.20.0"
-    const val APP_COMPAT = "1.1.0"
-    const val ACTIVITY = "1.1.0"
-
-    const val TEST_JUNIT = "1.1.1"
-    const val TEST_STRIKT = "0.25.0"
-    const val TEST_MOCKK = "1.9.3"
+    const val KTOR = "1.6.2"
+    const val SERIALIZATION = "1.2.2"
+    const val APP_COMPAT = "1.3.1"
+    const val ACTIVITY = "1.3.1"
+
+    const val TEST_JUNIT = "1.1.3"
+    const val TEST_STRIKT = "0.31.0"
+    const val TEST_MOCKK = "1.12.0"
 }
 
 object ProjectLib {
@@ -31,26 +30,24 @@ 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, SERIALIZATION, DETEKT, KTLINT, JACOCO, VERSIONS, MAVEN)
+    val all = setOf(ANDROID, KOTLIN, SERIALIZATION, DETEKT, KTLINT, JACOCO, VERSIONS)
 }
 
 object ModuleLib {
-    const val KOTLIN = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Version.KOTLIN}"
     const val COROUTINES_CORE = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Version.COROUTINES}"
     const val COROUTINES_ANDROID = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Version.COROUTINES}"
     const val LIVEDATA = "androidx.lifecycle:lifecycle-livedata-ktx:${Version.LIFECYCLE}"
 
     // Sample app only
     const val KTOR = "io.ktor:ktor-client-android:${Version.KTOR}"
     const val KTOR_SERIALIZATION = "io.ktor:ktor-client-serialization-jvm:${Version.KTOR}"
-    const val SERIALIZATION = "org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Version.SERIALIZATION}"
+    const val SERIALIZATION = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Version.SERIALIZATION}"
     const val APP_COMPAT = "androidx.appcompat:appcompat:${Version.APP_COMPAT}"
     const val ACTIVITY = "androidx.activity:activity-ktx:${Version.ACTIVITY}"
     const val VIEWMODEL = "androidx.lifecycle:lifecycle-viewmodel-ktx:${Version.LIFECYCLE}"
 
-    val sample = setOf(KOTLIN, COROUTINES_ANDROID, KTOR, KTOR_SERIALIZATION, SERIALIZATION, APP_COMPAT, ACTIVITY, VIEWMODEL)
+    val sample = setOf(COROUTINES_ANDROID, KTOR, KTOR_SERIALIZATION, SERIALIZATION, APP_COMPAT, ACTIVITY, VIEWMODEL)
 }
 
 object TestLib {

buildSrc/src/main/kotlin/Maven.kt

@@ -2,5 +2,5 @@
 
 object Maven {
 
-    const val GROUP = "com.github.adrielcafe.hal"
+    const val GROUP_ID = "com.github.adrielcafe.hal"
 }

gradle.properties

@@ -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
 

gradle/wrapper/gradle-wrapper.properties

@@ -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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip

hal-core/build.gradle

@@ -1,19 +1,30 @@
 apply plugin: 'kotlin'
 apply plugin: 'com.vanniktech.android.junit.jacoco'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
-group = Maven.GROUP
-
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
 
 sourceSets {
     main.java.srcDirs += 'src/main/kotlin/'
 }
 
 dependencies {
-    implementation ModuleLib.KOTLIN
     implementation ModuleLib.COROUTINES_CORE
 
     TestLib.all.forEach { testImplementation it }
 }
+
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.java
+
+                groupId = Maven.GROUP_ID
+                artifactId = "hal-core"
+            }
+        }
+    }
+}

hal-livedata/build.gradle

@@ -1,21 +1,19 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.github.dcendents.android-maven'
-
-group = Maven.GROUP
+apply plugin: 'maven-publish'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin/'
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     lintOptions {
         abortOnError false
@@ -30,9 +28,21 @@ android {
 dependencies {
     implementation project(':hal-core')
 
-    implementation ModuleLib.KOTLIN
     implementation ModuleLib.COROUTINES_ANDROID
     implementation ModuleLib.LIVEDATA
 
     TestLib.all.forEach { testImplementation it }
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+
+                groupId = Maven.GROUP_ID
+                artifactId = "hal-livedata"
+            }
+        }
+    }
 }

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

@@ -13,7 +13,7 @@ class LiveDataStateObserver<S : HAL.State>(
 ) : HAL.StateObserver<S> {
 
     override fun observe(stateFlow: Flow<S>) {
-        liveData<S> {
+        liveData {
             stateFlow.collect(::emit)
         }.observe(owner, onStateChanged)
     }

jitpack.yml

@@ -0,0 +1,2 @@
+jdk:
+  - openjdk11

sample/build.gradle

@@ -4,11 +4,11 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlinx-serialization'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId "cafe.adriel.hal.sample"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
     }