Merge pull request #32 from icerockdev/develop

Release 0.4.0

Author: anton6tak

.github/workflows/compilation-check.yml

@@ -12,9 +12,13 @@ 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
-    - name: Check build
-      run: ./gradlew detekt build publishToMavenLocal
+        java-version: 11
+    - name: Build and publish local
+      run: ./gradlew build publishToMavenLocal syncMultiPlatformLibraryDebugFrameworkIosX64
+    - name: Install pods
+      run: cd sample/ios-app && pod install
+    - name: Check iOS
+      run: cd sample/ios-app && xcodebuild -scheme TestProj -workspace TestProj.xcworkspace -configuration Debug -sdk iphonesimulator -arch x86_64 build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty

.github/workflows/publish.yml

@@ -21,10 +21,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: Publish
         run: ./gradlew publish
 
@@ -41,6 +41,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,15 +1,13 @@
 ![moko-errors](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/errors) ](https://repo1.maven.org/maven2/dev/icerock/moko/errors) ![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/errors) ](https://repo1.maven.org/maven2/dev/icerock/moko/errors) ![kotlin-version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=dev.icerock.moko&name=errors)
 # Mobile Kotlin errors
 This is a Kotlin MultiPlatform library that provides automatic exception handling and
 automatic error displaying to a screen.
 
 ## Table of Contents
 - [Features](#features)
 - [Requirements](#requirements)
-- [Versions](#versions)
 - [Installation](#installation)
 - [Usage](#usage)
 - [Samples](#samples)
@@ -29,23 +27,9 @@ on the platforms. Converts the exception class to an error object to display. Th
 `SelectorErrorPresenter` - for selecting error presenter by some custom condition.
 
 ## Requirements
-- Gradle version 6.0+
+- Gradle version 6.8+
 - Android API 16+
-- iOS version 9.0+
-
-## Versions
-### Bintray
-- kotlin 1.3.72
-  - 0.1.0
-  - 0.2.0
-  - 0.2.1
-- kotlin 1.4.0
-  - 0.3.0
-- kotlin 1.4.21
-  - 0.3.1
-### mavenCentral
- - kotlin 1.4.31
-   - 0.3.2
+- iOS version 11.0+
 
 ## Installation
 root build.gradle  
@@ -60,7 +44,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:errors:0.3.2")
+    commonMainApi("dev.icerock.moko:errors:0.4.0")
 }
 ```
 
@@ -181,14 +165,15 @@ fun onSendRequest() {
 }
 ```
 
-Also you can add some custom `catch` handlers for `ExceptionHandler`:
+Also you can add some custom `catch` handlers for `ExceptionHandler` that work as a catch in the
+try/catch operator:
 
 ```kotlin
 fun onSendRequest() {
     viewModelScope.launch {
         exceptionHandler.handle {
             serverRequest()
-        }.catch<IllegalArgumentException> {     // Specifying a specific exception class
+        }.catch<IllegalArgumentException> {     // Specifying exception class
             // Some custom handler code
             false                               // true - cancels ErrorPresenter; false - allows execution of ErrorsPresenter
         }.execute()                             // Starts code execution in `handle` lambda

build.gradle.kts

@@ -11,47 +11,20 @@ buildscript {
     }
 
     dependencies {
-        plugin(Deps.Plugins.mokoResources)
-    }
-}
+        classpath("dev.icerock.moko:resources-generator:0.16.0")
 
-plugins {
-    plugin(Deps.Plugins.detekt).apply(false)
+        classpath(":errors-build-logic")
+    }
 }
 
 allprojects {
-    repositories {
-        mavenCentral()
-        google()
-
-        jcenter {
-            content {
-                includeGroup("org.jetbrains.trove4j")
-                includeGroup("org.jetbrains.kotlinx")
-            }
-        }
-    }
-
-    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)
-            }
+    allprojects {
+        plugins.withId("org.gradle.maven-publish") {
+            group = "dev.icerock.moko"
+            version = libs.versions.mokoErrorsVersion.get()
         }
     }
-
-    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 {

buildSrc/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")
+}

buildSrc/src/main/kotlin/Deps.kt

@@ -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")
+    }
+}

errors-build-logic/build.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)
+    }
+}

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

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("android-base-convention")
+}
+
+android {
+    sourceSets.all { java.srcDir("src/$name/kotlin") }
+}

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

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("publication-convention")
+}
+
+afterEvaluate {
+    publishing.publications {
+        create("release", MavenPublication::class.java) {
+            from(components.getByName("release"))
+        }
+    }
+}

errors-build-logic/src/main/kotlin/android-library-convention.gradle.kts

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("io.gitlab.arturbosch.detekt")
+}
+
+detekt {
+    input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin", "src/main/kotlin")
+}
+
+dependencies {
+    "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.15.0")
+}