Merge remote-tracking branch 'upstream/main'

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
     # Skip if head commit contains 'skip ci'
     if: "!contains(github.event.head_commit.message, 'skip ci')"
 
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v3
@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2

.java-version

@@ -0,0 +1 @@
+17.0

README.md

@@ -3,10 +3,10 @@
 ![Build & test](https://github.com/mxalbert1996/Zoomable/actions/workflows/build.yml/badge.svg)
 [![Maven Central](https://img.shields.io/maven-central/v/com.mxalbert.zoomable/zoomable)](https://search.maven.org/artifact/com.mxalbert.zoomable/zoomable)
 
-Content zooming with dragging, double tap and dismiss gesture support for Compose.
-Supports Jetpack Compose and Compose for Desktop.
+Content zooming with dragging, double tap and dismiss gesture support for Compose Multiplatform.
+Supports Android, iOS and desktop.
 
-The demo can also be installed from [Google Play](https://play.google.com/store/apps/details?id=com.mxalbert.zoomable.sample).
+The demo for Android can also be installed from [Google Play](https://play.google.com/store/apps/details?id=com.mxalbert.zoomable.sample).
 
 ## Features
 
@@ -61,7 +61,7 @@ Note that `Modifier.aspectRatio()` is needed in order to remove the extra space
 when the image is zoomed.
 
 For how to use `Zoomable` with [Coil](https://github.com/coil-kt/coil), see
-[the sample](sample/src/main/java/com/mxalbert/zoomable/sample/MainActivity.kt).
+[the sample](sample/shared/src/androidMain/kotlin/com/mxalbert/zoomable/sample/ZoomableApp.android.kt#L26-L41).
 
 ## Notes
 

build.gradle.kts

@@ -1,6 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import com.android.build.api.dsl.CommonExtension as AndroidCommonExtension
-
 buildscript {
     repositories {
         google()
@@ -12,28 +9,6 @@ buildscript {
     }
 }
 
-subprojects {
-    afterEvaluate {
-        extensions.findByType(AndroidCommonExtension::class)?.apply {
-            buildFeatures {
-                buildConfig = false
-            }
-
-            compileOptions {
-                sourceCompatibility = JavaVersion.VERSION_1_8
-                targetCompatibility = JavaVersion.VERSION_1_8
-            }
-        }
-
-        tasks.withType<KotlinCompile> {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-                freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
-            }
-        }
-    }
-}
-
 task<Delete>("clean") {
     delete(rootProject.buildDir)
 }

gradle.properties

@@ -20,13 +20,14 @@ android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
-android.disableAutomaticComponentCreation=true
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
+kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.native.cacheKind=none
+kotlin.native.ignoreIncorrectDependencies=true
+org.jetbrains.compose.experimental.uikit.enabled=true
 
 GROUP=com.mxalbert.zoomable
 POM_ARTIFACT_ID=zoomable
-VERSION_NAME=1.6.0-SNAPSHOT
+VERSION_NAME=1.7.0-SNAPSHOT
 
 POM_NAME=Zoomable
 POM_DESCRIPTION=Content zooming with dragging, double tap and dismiss gesture support for Jetpack Compose.

gradle/libs.versions.toml

@@ -1,50 +1,50 @@
 [versions]
-agp = "7.2.1"
+agp = "8.0.0"
 sdk-min = "21"
-sdk-target = "32"
-sdk-compile = "32"
-buildTools = "32.0.0"
-binaryCompatibilityValidator = "0.11.0"
-maven-publish = "0.21.0"
-kotlin = "1.6.10"
-coroutines = "1.6.1"
-compose-jetbrains = "1.1.1"
-compose-jetpack = "1.1.1"
-androidx-activity = "1.5.0"
-accompanist = "0.23.1"
-coil = "2.1.0"
+sdk-target = "33"
+sdk-compile = "33"
+buildTools = "33.0.2"
+binaryCompatibilityValidator = "0.13.0"
+maven-publish = "0.25.2"
+kotlin = "1.8.20"
+dokka = "1.8.10"
+coroutines = "1.6.4"
+compose-jetbrains = "1.4.0"
+compose-jetpack = "1.4.2"
+compose-compiler = "1.4.6"
+ktor = "2.3.0"
+androidx-activity = "1.7.1"
+coil = "2.2.2"
 jUnit = "4.13.2"
 truth = "1.1.3"
-testExt = "1.1.3"
+testExt = "1.1.5"
 
 [libraries]
 kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+compose-compiler-jetpack = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
 compose-runtime-jetbrains = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose-jetbrains" }
 compose-runtime-jetpack = { module = "androidx.compose.runtime:runtime", version.ref = "compose-jetpack" }
 compose-foundation-jetbrains = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose-jetbrains" }
 compose-foundation-jetpack = { module = "androidx.compose.foundation:foundation", version.ref = "compose-jetpack" }
 compose-ui-util-jetbrains = { module = "org.jetbrains.compose.ui:ui-util", version.ref = "compose-jetbrains" }
 compose-ui-util-jetpack = { module = "androidx.compose.ui:ui-util", version.ref = "compose-jetpack" }
-compose-material = { module = "androidx.compose.material:material", version.ref = "compose-jetpack" }
 compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose-jetpack" }
 compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose-jetpack" }
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
+ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
-accompanist-insets = { module = "com.google.accompanist:accompanist-insets", version.ref = "accompanist" }
-accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" }
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 jUnit = { module = "junit:junit", version.ref = "jUnit" }
 truth = { module = "com.google.truth:truth", version.ref = "truth" }
 testExt = { module = "androidx.test.ext:junit", version.ref = "testExt" }
 
-[bundles]
-accompanist = ["accompanist-insets", "accompanist-pager"]
-
 [plugins]
 jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose-jetbrains" }
 kotlin-binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryCompatibilityValidator" }
-dokka = { id = "org.jetbrains.dokka", version.ref = "kotlin" }
+dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 maven-publish-base = { id = "com.vanniktech.maven.publish.base", version.ref = "maven-publish" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jul 24 12:40:38 JST 2022
+#Mon Apr 17 20:11:28 JST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

sample/build.gradle.kts → sample/androidApp/build.gradle.kts

@@ -10,7 +10,10 @@ android {
     compileSdk = libs.versions.sdk.compile.get().toInt()
     buildToolsVersion = libs.versions.buildTools.get()
 
-    buildFeatures.compose = true
+    buildFeatures {
+        buildConfig = false
+        compose = true
+    }
 
     defaultConfig {
         applicationId = "com.mxalbert.zoomable.sample"
@@ -40,8 +43,17 @@ android {
             .fold(0) { result, number -> (result + number.toInt()) * 100 }
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+
     composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.jetpack.get()
+        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
 
     buildTypes {
@@ -54,7 +66,7 @@ android {
         }
     }
 
-    packagingOptions {
+    packaging {
         resources.excludes += listOf(
             "META-INF/*",
             "**/*.kotlin_builtins",
@@ -64,9 +76,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":zoomable"))
+    implementation(project(":sample:shared"))
     implementation(libs.androidx.activity.compose)
-    implementation(libs.compose.material)
-    implementation(libs.bundles.accompanist)
-    implementation(libs.coil.compose)
 }

sample/proguard-rules.pro → sample/androidApp/proguard-rules.pro

@@ -18,4 +18,8 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**

sample/androidApp/src/main/java/com/mxalbert/zoomable/sample/MainActivity.kt

@@ -0,0 +1,16 @@
+package com.mxalbert.zoomable.sample
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.core.view.WindowCompat
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        setContent {
+            ZoomableApp()
+        }
+    }
+}

sample/desktopApp/.gitignore

@@ -0,0 +1 @@
+/build

sample/desktopApp/build.gradle.kts

@@ -0,0 +1,24 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    kotlin("jvm")
+    alias(libs.plugins.jetbrains.compose)
+}
+
+tasks.withType(KotlinCompile::class).configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
+compose.desktop {
+    application {
+        mainClass = "com.mxalbert.zoomable.sample.MainKt"
+    }
+}
+
+dependencies {
+    implementation(project(":sample:shared"))
+    implementation(compose.desktop.currentOs)
+}

sample/desktopApp/src/main/kotlin/com/mxalbert/zoomable/sample/main.kt

@@ -0,0 +1,14 @@
+package com.mxalbert.zoomable.sample
+
+import androidx.compose.ui.window.Window
+import androidx.compose.ui.window.application
+import com.mxalbert.zoomable.sample.ZoomableApp
+
+fun main() = application {
+    Window(
+        onCloseRequest = ::exitApplication,
+        title = "Zoomable"
+    ) {
+        ZoomableApp()
+    }
+}

sample/iosApp/.gitignore

@@ -0,0 +1,5 @@
+Podfile.lock
+Pods/*
+Zoomable.xcworkspace/*
+Zoomable.xcodeproj/*
+!Zoomable.xcodeproj/project.pbxproj

sample/iosApp/Podfile

@@ -0,0 +1,5 @@
+target 'Zoomable' do
+  use_frameworks!
+  platform :ios, '14.1'
+  pod 'shared', :path => '../shared'
+end