Merge pull request #14 from anton6tak/#13-update-to-kotlin-1.5.20-and-gradle-0.7.2

#13 update to kotlin 1.5.20 and gradle 0.7.2

Author: Alex009

.github/workflows/compilation-check.yml

@@ -12,17 +12,15 @@ 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: Cocoapods install
       run: (cd sample/ios-app && pod install)
-    - name: Build K/N cache
-      run: ./gradlew :crash-reporting-core:runCommonizer
     - name: Check library
       run: ./gradlew build publishToMavenLocal syncMultiPlatformLibraryDebugFrameworkIosX64
     - name: Install pods with kotlin
       run: cd sample/ios-app && pod install
     - name: build ios sample
-      run: cd sample/ios-app && xcodebuild -scheme TestProj -workspace TestProj.xcworkspace -configuration Debug build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
+      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: Cocoapods install
         run: (cd sample/ios-app && pod install)
       - name: Publish library
@@ -42,6 +42,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,5 +1,5 @@
 ![moko-crash-reporting](https://user-images.githubusercontent.com/701307/98647965-37858400-2368-11eb-98e8-6e62d75fa6af.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/crash-reporting-core) ](https://repo1.maven.org/maven2/dev/icerock/moko/crash-reporting-core) ![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/crash-reporting-core) ](https://repo1.maven.org/maven2/dev/icerock/moko/crash-reporting-core) ![kotlin-version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=dev.icerock.moko&name=crash-reporting-core)
 
 # Mobile Kotlin crash report
 
@@ -8,7 +8,6 @@ This is a Kotlin MultiPlatform library that provides reporting fatal and non-fat
 ## Table of Contents
 - [Features](#features)
 - [Requirements](#requirements)
-- [Versions](#versions)
 - [Installation](#installation)
 - [Usage](#usage)
 - [Samples](#samples)
@@ -21,19 +20,9 @@ This is a Kotlin MultiPlatform library that provides reporting fatal and non-fat
 - **CrashReportingAntilog** can be used for **Napier** logger to log messages and errors by **ExceptionLogger**
 
 ## Requirements
-- Gradle version 6.0+
+- Gradle version 6.8+
 - Android API 16+
-- iOS version 9.0+
-
-## Versions
-### Bintray
-- kotlin 1.4.10
-  - 0.1.0
-- kotlin 1.4.21
-  - 0.1.1
-### mavenCentral
-- kotlin 1.4.31
-  - 0.1.2
+- iOS version 11.0+
 
 ## Installation
 root build.gradle  
@@ -48,8 +37,8 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainImplementation("dev.icerock.moko:crash-reporting-crashlytics:0.1.2") // for CrashlyticsLogger
-    commonMainImplementation("dev.icerock.moko:crash-reporting-napier:0.1.2") // for CrashReportingAntilog
+    commonMainImplementation("dev.icerock.moko:crash-reporting-crashlytics:2.0.0") // for CrashlyticsLogger
+    commonMainImplementation("dev.icerock.moko:crash-reporting-napier:2.0.0") // for CrashReportingAntilog
     commonMainImplementation("com.github.aakira:napier:1.4.1") // for CrashReportingAntilog
 }
 ```

build.gradle.kts

@@ -2,132 +2,26 @@
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import java.util.Base64
-
-plugins {
-    plugin(Deps.Plugins.detekt) apply false
-}
-
 buildscript {
     repositories {
         mavenCentral()
         google()
-
-        jcenter {
-            content {
-                includeGroup("org.jetbrains.trove4j")
-            }
-        }
-    }
-    dependencies {
-        plugin(Deps.Plugins.googleServices)
-        plugin(Deps.Plugins.firebaseCrashlytics)
-    }
-}
-
-allprojects {
-    repositories {
-        mavenCentral()
-        google()
-
-        jcenter {
-            content {
-                includeGroup("org.jetbrains.trove4j")
-                includeGroup("org.jetbrains.kotlinx")
-                includeGroup("com.github.aakira")
-            }
-        }
-    }
-
-    apply(plugin = Deps.Plugins.detekt.id)
-
-    configure<io.gitlab.arturbosch.detekt.extensions.DetektExtension> {
-        input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin")
+        gradlePluginPortal()
+        jcenter()
     }
 
     dependencies {
-        "detektPlugins"(Deps.Libs.Jvm.detektFormatting)
-    }
-
-    plugins.withId(Deps.Plugins.androidLibrary.id) {
-        configure<com.android.build.gradle.LibraryExtension> {
-            compileSdkVersion(Deps.Android.compileSdk)
+        classpath("com.google.gms:google-services:4.3.8")
+        classpath("com.google.firebase:firebase-crashlytics-gradle:2.2.0")
 
-            defaultConfig {
-                minSdkVersion(Deps.Android.minSdk)
-                targetSdkVersion(Deps.Android.targetSdk)
-            }
-        }
+        classpath(":crash-reporting-build-logic")
     }
+}
 
-    plugins.withId(Deps.Plugins.mavenPublish.id) {
+allprojects {
+    plugins.withId("org.gradle.maven-publish") {
         group = "dev.icerock.moko"
-        version = Deps.mokoCrashReportingVersion
-
-        val javadocJar by tasks.registering(Jar::class) {
-            archiveClassifier.set("javadoc")
-        }
-
-        configure<PublishingExtension> {
-            repositories.maven("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                name = "OSSRH"
-
-                credentials {
-                    username = System.getenv("OSSRH_USER")
-                    password = System.getenv("OSSRH_KEY")
-                }
-            }
-
-            publications.withType<MavenPublication> {
-                // Stub javadoc.jar artifact
-                artifact(javadocJar.get())
-
-                // Provide artifacts information requited by Maven Central
-                pom {
-                    name.set("MOKO crash reporting")
-                    description.set("Fatal and Non-Fatal reporting to Crashlytics for Kotlin Multiplatform Mobile")
-                    url.set("https://github.com/icerockdev/moko-crash-reporting")
-                    licenses {
-                        license {
-                            url.set("https://github.com/icerockdev/moko-crash-reporting/blob/master/LICENSE.md")
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            id.set("Dorofeev")
-                            name.set("Andrey Dorofeev")
-                            email.set("adorofeev@icerockdev.com")
-                        }
-                        developer {
-                            id.set("Alex009")
-                            name.set("Aleksey Mikhailov")
-                            email.set("aleksey.mikhailov@icerockdev.com")
-                        }
-                    }
-
-                    scm {
-                        connection.set("scm:git:ssh://github.com/icerockdev/moko-crash-reporting.git")
-                        developerConnection.set("scm:git:ssh://github.com/icerockdev/moko-crash-reporting.git")
-                        url.set("https://github.com/icerockdev/moko-crash-reporting")
-                    }
-                }
-            }
-
-            apply(plugin = Deps.Plugins.signing.id)
-
-            configure<SigningExtension> {
-                val signingKeyId: String? = System.getenv("SIGNING_KEY_ID")
-                val signingPassword: String? = System.getenv("SIGNING_PASSWORD")
-                val signingKey: String? = System.getenv("SIGNING_KEY")?.let { base64Key ->
-                    String(Base64.getDecoder().decode(base64Key))
-                }
-                if (signingKeyId != null) {
-                    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
-                    sign(publications)
-                }
-            }
-        }
+        version = libs.versions.mokoCrashReportingVersion.get()
     }
 }
 

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