Merge pull request #10 from icerockdev/develop

Release 0.2.0

.github/workflows/compilation-check.yml

@@ -12,13 +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
+          java-version: 11
       - name: Check runtime
         run: ./gradlew build publishToMavenLocal syncMultiPlatformLibraryDebugFrameworkIosX64
       - name: Install pods
         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

@@ -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-biometry](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/biometry) ](https://repo1.maven.org/maven2/dev/icerock/moko/biometry) ![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/biometry) ](https://repo1.maven.org/maven2/dev/icerock/moko/biometry) ![kotlin-version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=dev.icerock.moko&name=biometry)
 
 # Mobile Kotlin biometry
 This is a Kotlin Multiplatform library that provides authentication by FaceId and TouchId(Fingerprint)
 
 ## Table of Contents
 - [Features](#features)
 - [Requirements](#requirements)
-- [Versions](#versions)
 - [Installation](#installation)
 - [Usage](#usage)
 - [Samples](#samples)
@@ -19,17 +18,9 @@ This is a Kotlin Multiplatform library that provides authentication by FaceId an
 ...
 
 ## Requirements
-- Gradle version 6.0+
+- Gradle version 6.8+
 - Android API 16+
-- iOS version 9.0+
-
-## Versions
-### Bintray
-- kotlin 1.4.21
-  - 0.1.0
-### mavenCentral
-- kotlin 1.4.31
-  - 0.1.1
+- iOS version 11.0+
 
 ## Installation
 root build.gradle  
@@ -44,7 +35,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:biometry:0.1.1")
+    commonMainApi("dev.icerock.moko:biometry:0.2.0")
 }
 ```
 

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

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

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

biometry-build-logic/src/main/kotlin/android-library-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") }
+}

biometry-build-logic/src/main/kotlin/android-publication-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"))
+        }
+    }
+}

biometry-build-logic/src/main/kotlin/detekt-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")
+}

biometry-build-logic/src/main/kotlin/javadoc-stub-convention.gradle.kts

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("org.gradle.maven-publish")
+}
+
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+}
+
+publishing.publications.withType<MavenPublication> {
+    // Stub javadoc.jar artifact
+    artifact(javadocJar.get())
+}

biometry-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.multiplatform")
+    id("android-base-convention")
+    id("dev.icerock.mobile.multiplatform.android-manifest")
+}
+
+kotlin {
+    android {
+        publishLibraryVariants("release", "debug")
+    }
+    ios()
+}

biometry-build-logic/src/main/kotlin/publication-convention.gradle.kts

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import java.util.Base64
+
+plugins {
+    id("javadoc-stub-convention")
+    id("org.gradle.maven-publish")
+    id("signing")
+}
+
+publishing {
+    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> {
+        // Provide artifacts information requited by Maven Central
+        pom {
+            name.set("MOKO biometry")
+            description.set("Biometry authentication with Touch ID, Face ID from common code with Kotlin Multiplatform Mobile")
+            url.set("https://github.com/icerockdev/moko-biometry")
+            licenses {
+                license {
+                    name.set("Apache-2.0")
+                    distribution.set("repo")
+                    url.set("https://github.com/icerockdev/moko-biometry/blob/master/LICENSE.md")
+                }
+            }
+
+            developers {
+                developer {
+                    id.set("Dorofeev")
+                    name.set("Andrey Dorofeev")
+                    email.set("[email protected]")
+                }
+                developer {
+                    id.set("kovalandrew")
+                    name.set("Andrey Kovalev")
+                    email.set("[email protected]")
+                }
+                developer {
+                    id.set("Alex009")
+                    name.set("Aleksey Mikhailov")
+                    email.set("[email protected]")
+                }
+            }
+
+            scm {
+                connection.set("scm:git:ssh://github.com/icerockdev/moko-biometry.git")
+                developerConnection.set("scm:git:ssh://github.com/icerockdev/moko-biometry.git")
+                url.set("https://github.com/icerockdev/moko-biometry")
+            }
+        }
+    }
+}
+
+
+signing {
+    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(publishing.publications)
+    }
+}