Merge pull request #61 from icerockdev/develop

Release 0.10.0
icerockdev · May 13, 2022 · df68164 · df68164
2 parents e901874 + 634942b
commit df68164
Show file tree

Hide file tree

Showing 48 changed files with 269 additions and 487 deletions.
diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml
@@ -21,7 +21,7 @@ jobs:
       - 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 -sdk iphonesimulator -arch x86_64 build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty
+        run: cd sample/ios-app && set -o pipefail && xcodebuild -scheme TestProj -workspace TestProj.xcworkspace -configuration Debug -sdk iphonesimulator -arch x86_64 build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v2
         if: ${{ always() }}

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:media:0.9.0")
+    commonMainApi("dev.icerock.moko:media:0.10.0")
 }
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,15 +10,18 @@ buildscript {
     }
 
     dependencies {
-        classpath(":media-build-logic")
+        classpath(libs.kotlinGradlePlugin)
+        classpath(libs.androidGradlePlugin)
+        classpath(libs.mokoGradlePlugin)
+        classpath(libs.mobileMultiplatformGradlePlugin)
     }
 }
 
+apply(plugin = "dev.icerock.moko.gradle.publication.nexus")
+val mokoVersion = libs.versions.mokoMediaVersion.get()
 allprojects {
-    plugins.withId("org.gradle.maven-publish") {
-        group = "dev.icerock.moko"
-        version = libs.versions.mokoMediaVersion.get()
-    }
+    group = "dev.icerock.moko"
+    version = mokoVersion
 }
 
 tasks.register("clean", Delete::class).configure {

diff --git a/gradle.properties b/gradle.properties
@@ -3,8 +3,16 @@ org.gradle.configureondemand=false
 org.gradle.parallel=true
 
 kotlin.code.style=official
-kotlin.native.enableDependencyPropagation=false
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 android.useAndroidX=true
+
+moko.android.targetSdk=31
+moko.android.compileSdk=31
+moko.android.minSdk=19
+
+moko.publish.name=MOKO media
+moko.publish.description=Media selection & presenting for mobile (android & ios) Kotlin Multiplatform development
+moko.publish.repo.org=icerockdev
+moko.publish.repo.name=moko-media
+moko.publish.license=Apache-2.0
+moko.publish.developers=alex009|Aleksey Mikhailov|[email protected],Tetraquark|Vladislav Areshkin|[email protected],RezMike|Mikhail Reznichenko|[email protected]
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,14 +1,15 @@
 [versions]
-androidAppCompatVersion = "1.2.0"
-materialDesignVersion = "1.0.0"
-androidLifecycleVersion = "2.1.0"
+kotlinVersion = "1.6.21"
+androidAppCompatVersion = "1.3.1"
+materialDesignVersion = "1.4.0"
+androidLifecycleVersion = "2.3.1"
 androidExifInterface = "1.3.2"
 androidMediaFilePicker = "1.9.1"
-coroutinesVersion = "1.5.0-native-mt"
-mokoMvvmVersion = "0.11.0"
-mokoPermissionsVersion = "0.10.1"
-mokoTestVersion = "0.4.0"
-mokoMediaVersion = "0.9.0"
+coroutinesVersion = "1.6.0-native-mt"
+mokoMvvmVersion = "0.13.0"
+mokoPermissionsVersion = "0.11.0"
+mokoTestVersion = "0.6.1"
+mokoMediaVersion = "0.10.0"
 
 [libraries]
 appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
@@ -23,3 +24,8 @@ mokoMvvmLiveData = { module = "dev.icerock.moko:mvvm-livedata", version.ref = "m
 mokoTest = { module = "dev.icerock.moko:test-core", version.ref = "mokoTestVersion" }
 mokoMvvmTest = { module = "dev.icerock.moko:mvvm-test", version.ref = "mokoMvvmVersion" }
 mokoPermissionsTest = { module = "dev.icerock.moko:permissions-test", version.ref = "mokoPermissionsVersion" }
+
+kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
+androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "7.2.0" }
+mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.1.0" }
+mobileMultiplatformGradlePlugin = { module = "dev.icerock:mobile-multiplatform", version = "0.14.1" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/media-build-logic/build.gradle.kts b/media-build-logic/build.gradle.kts
diff --git a/media-build-logic/src/main/kotlin/android-app-convention.gradle.kts b/media-build-logic/src/main/kotlin/android-app-convention.gradle.kts
diff --git a/media-build-logic/src/main/kotlin/android-base-convention.gradle.kts b/media-build-logic/src/main/kotlin/android-base-convention.gradle.kts
diff --git a/media-build-logic/src/main/kotlin/android-library-convention.gradle.kts b/media-build-logic/src/main/kotlin/android-library-convention.gradle.kts
diff --git a/media-build-logic/src/main/kotlin/android-publication-convention.gradle.kts b/media-build-logic/src/main/kotlin/android-publication-convention.gradle.kts
diff --git a/media-build-logic/src/main/kotlin/detekt-convention.gradle.kts b/media-build-logic/src/main/kotlin/detekt-convention.gradle.kts
diff --git a/media-build-logic/src/main/kotlin/javadoc-stub-convention.gradle.kts b/media-build-logic/src/main/kotlin/javadoc-stub-convention.gradle.kts
diff --git a/media-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts b/media-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts
diff --git a/media-build-logic/src/main/kotlin/publication-convention.gradle.kts b/media-build-logic/src/main/kotlin/publication-convention.gradle.kts
diff --git a/media-test/build.gradle.kts b/media-test/build.gradle.kts
@@ -3,15 +3,16 @@
  */
 
 plugins {
-    id("multiplatform-library-convention")
-    id("dev.icerock.mobile.multiplatform.android-manifest")
-    id("publication-convention")
+    id("dev.icerock.moko.gradle.multiplatform.mobile")
+    id("dev.icerock.moko.gradle.publication")
+    id("dev.icerock.moko.gradle.stub.javadoc")
+    id("dev.icerock.moko.gradle.detekt")
 }
 
 dependencies {
     commonMainApi(projects.media)
 
-    "androidMainImplementation"(libs.appCompat)
+    androidMainImplementation(libs.appCompat)
 
     commonTestImplementation(libs.mokoTest)
 }
diff --git a/media-test/src/commonTest/kotlin/dev/icerock/moko/media/test/BitmapMockTests.kt b/media-test/src/commonTest/kotlin/dev/icerock/moko/media/test/BitmapMockTests.kt
@@ -10,7 +10,7 @@ class BitmapMockTests {
     @Test
     fun `bitmap byte array`() {
         val bitmap = createBitmapMock()
-        val byteArray = bitmap.toByteArray()
+        bitmap.toByteArray()
         // we should not throw any exceptions
     }
 }
diff --git a/media/build.gradle.kts b/media/build.gradle.kts
@@ -3,18 +3,19 @@
  */
 
 plugins {
-    id("multiplatform-library-convention")
-    id("dev.icerock.mobile.multiplatform.android-manifest")
-    id("publication-convention")
+    id("dev.icerock.moko.gradle.multiplatform.mobile")
+    id("dev.icerock.moko.gradle.publication")
+    id("dev.icerock.moko.gradle.stub.javadoc")
+    id("dev.icerock.moko.gradle.detekt")
 }
 
 dependencies {
     commonMainImplementation(libs.coroutines)
     commonMainApi(libs.mokoPermissions)
 
-    "androidMainImplementation"(libs.appCompat)
-    "androidMainImplementation"(libs.exifInterface)
+    androidMainImplementation(libs.appCompat)
+    androidMainImplementation(libs.exifInterface)
 
     // TODO #34 remove external dependency
-    "androidMainImplementation"(libs.mediaFilePicker)
+    androidMainImplementation(libs.mediaFilePicker)
 }
diff --git a/media/src/androidMain/kotlin/dev/icerock/moko/media/Bitmap.kt b/media/src/androidMain/kotlin/dev/icerock/moko/media/Bitmap.kt
@@ -41,6 +41,7 @@ actual class Bitmap constructor(
 
         override fun getByteArray(): ByteArray {
             val byteArrayOutputStream = ByteArrayOutputStream()
+            @Suppress("MagicNumber")
             bitmap.compress(
                 android.graphics.Bitmap.CompressFormat.PNG,
                 100,