Merge pull request #46 from anton6tak/#45-update-kotlin-to-1.5.20-gra…

…dle-7.0.2-use-convention-plugin

#45 update kotlin to 1.5.20 gradle 7.0.2 use convention plugin

.github/workflows/compilation-check.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Check runtime
         run: ./gradlew build publishToMavenLocal syncMultiPlatformLibraryDebugFrameworkIosX64
       - name: Install pods

.github/workflows/publish.yml

@@ -20,10 +20,10 @@ jobs:
       SIGNING_KEY: ${{ secrets.GPG_KEY_CONTENTS }}
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Publish
         run: ./gradlew publish
   release:
@@ -39,6 +39,6 @@ jobs:
         with:
           commitish: ${{ github.ref }}
           tag_name: release/${{ github.event.inputs.version }}
-          release_name: Release ${{ github.event.inputs.version }}
+          release_name: ${{ github.event.inputs.version }}
           body: "Will be filled later"
           draft: true

README.md

@@ -1,13 +1,12 @@
 ![moko-paging](img/logo.png)  
-[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock.moko/paging) ](https://repo1.maven.org/maven2/dev/icerock/moko/paging) ![kotlin-version](https://img.shields.io/badge/kotlin-1.4.31-orange)
+[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock.moko/paging) ](https://repo1.maven.org/maven2/dev/icerock/moko/paging) ![kotlin-version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=dev.icerock.moko&name=paging)
 
 # Mobile Kotlin paging
 This is a Kotlin MultiPlatform library that contains pagination logic for kotlin multiplatform
 
 ## Table of Contents
 - [Features](#features)
 - [Requirements](#requirements)
-- [Versions](#versions)
 - [Installation](#installation)
 - [Usage](#usage)
 - [Samples](#samples)
@@ -22,30 +21,9 @@ This is a Kotlin MultiPlatform library that contains pagination logic for kotlin
 - Observing states of **Pagination** using `LiveData` from **moko-mvvm**.
 
 ## Requirements
-- Gradle version 6.0+
+- Gradle version 6.8+
 - Android API 16+
-- iOS version 9.0+
-
-## Versions
-### Bintray
-- kotlin 1.3.61
-  - 0.1.0
-- kotlin 1.3.70
-  - 0.2.0
-  - 0.2.1
-  - 0.2.2
-  - 0.3.0
-  - 0.3.1
-- kotlin 1.4.0
-  - 0.4.0
-- kotlin 1.4.21
-  - 0.4.1
-  - 0.4.2
-  - 0.4.3
-### mavenCentral
-- kotlin 1.4.31
-  - 0.4.4
-  - 0.4.5
+- iOS version 11.0+
 
 ## Installation
 root build.gradle  
@@ -60,7 +38,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:paging:0.4.6")
+    commonMainApi("dev.icerock.moko:paging:0.5.0")
 }
 ```
 

build.gradle.kts

@@ -1,61 +1,37 @@
 /*
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
+import org.gradle.api.internal.artifacts.DefaultModuleVersionSelector
 
 buildscript {
     repositories {
         mavenCentral()
         google()
-
-        jcenter {
-            content {
-                includeGroup("org.jetbrains.trove4j")
-            }
-        }
+        gradlePluginPortal()
     }
 
     dependencies {
-        plugin(Deps.Plugins.mokoUnits)
-    }
-}
+        classpath("dev.icerock.moko:units-generator:0.6.0")
 
-plugins {
-    plugin(Deps.Plugins.detekt).apply(false)
+        classpath(":paging-build-logic")
+    }
 }
 
 allprojects {
-    repositories {
-        mavenCentral()
-        google()
-
-        jcenter {
-            content {
-                includeGroup("org.jetbrains.trove4j")
-                includeGroup("org.jetbrains.kotlinx")
-            }
-        }
+    plugins.withId("org.gradle.maven-publish") {
+        group = "dev.icerock.moko"
+        version = libs.versions.mokoPagingVersion.get()
     }
-
-    plugins.withId(Deps.Plugins.androidLibrary.id) {
-        configure<com.android.build.gradle.LibraryExtension> {
-            compileSdkVersion(Deps.Android.compileSdk)
-
-            defaultConfig {
-                minSdkVersion(Deps.Android.minSdk)
-                targetSdkVersion(Deps.Android.targetSdk)
-            }
+    configurations.configureEach {
+        resolutionStrategy {
+            val coroutines: MinimalExternalModuleDependency = rootProject.libs.coroutines.get()
+            val forcedCoroutines: ModuleVersionSelector = DefaultModuleVersionSelector.newSelector(
+                coroutines.module,
+                coroutines.versionConstraint.requiredVersion
+            )
+            force(forcedCoroutines)
         }
     }
-
-    apply(plugin = Deps.Plugins.detekt.id)
-
-    configure<io.gitlab.arturbosch.detekt.extensions.DetektExtension> {
-        input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin")
-    }
-
-    dependencies {
-        "detektPlugins"(Deps.Libs.Detekt.detektFormatting)
-    }
 }
 
 tasks.register("clean", Delete::class).configure {

gradle/libs.versions.toml

@@ -0,0 +1,28 @@
+[versions]
+kotlinVersion = "1.5.20"
+androidAppCompatVersion = "1.2.0"
+androidLifecycleVersion = "2.1.0"
+androidCoreTestingVersion = "2.1.0"
+recyclerViewVersion = "1.1.0"
+swipeRefreshLayoutVersion = "1.1.0"
+ktorClientVersion = "1.6.0"
+coroutinesVersion = "1.5.0-native-mt"
+mokoMvvmVersion = "0.11.0"
+mokoResourcesVersion = "0.16.0"
+mokoUnitsVersion = "0.6.0"
+mokoPagingVersion = "0.5.0"
+
+[libraries]
+appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
+recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerViewVersion" }
+lifecycle = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "androidLifecycleVersion" }
+swipeRefreshLayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swipeRefreshLayoutVersion" }
+coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutinesVersion" }
+ktorClient = { module = "io.ktor:ktor-client-core", version.ref = "ktorClientVersion" }
+mokoResources = { module = "dev.icerock.moko:resources", version.ref = "mokoResourcesVersion" }
+mokoUnits = { module = "dev.icerock.moko:units", version.ref = "mokoUnitsVersion" }
+mokoMvvmLiveData = { module = "dev.icerock.moko:mvvm-livedata", version.ref = "mokoMvvmVersion" }
+mokoMvvmState = { module = "dev.icerock.moko:mvvm-state", version.ref = "mokoMvvmVersion" }
+kotlinTestJUnit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinVersion" }
+androidCoreTesting = { module = "androidx.arch.core:core-testing", version.ref = "androidCoreTestingVersion" }
+ktorClientMock = { module = "io.ktor:ktor-client-mock", version.ref = "ktorClientVersion" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

paging-build-logic/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+    google()
+
+    gradlePluginPortal()
+}
+
+dependencies {
+    api("dev.icerock:mobile-multiplatform:0.12.0")
+    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
+    api("com.android.tools.build:gradle:4.2.1")
+    api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0")
+}

paging-build-logic/src/main/kotlin/android-app-convention.gradle.kts

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("com.android.application")
+    id("android-base-convention")
+    id("kotlin-android")
+}
+
+android {
+    dexOptions {
+        javaMaxHeapSize = "2g"
+    }
+
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = true
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+        }
+        getByName("debug") {
+            isDebuggable = true
+            applicationIdSuffix = ".debug"
+        }
+    }
+
+    packagingOptions {
+        exclude("META-INF/*.kotlin_module")
+        exclude("META-INF/AL2.0")
+        exclude("META-INF/LGPL2.1")
+    }
+}

paging-build-logic/src/main/kotlin/android-base-convention.gradle.kts

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import com.android.build.gradle.BaseExtension
+
+configure<BaseExtension> {
+    compileSdkVersion(30)
+
+    defaultConfig {
+        minSdkVersion(16)
+        targetSdkVersion(30)
+    }
+}