Remove android specific projects, remove sample and downgrade kotlin …

…to 2.0.21
Vodes · Dec 15, 2024 · 2ed8fbb · 2ed8fbb
1 parent 75d5087
commit 2ed8fbb
Show file tree

Hide file tree

Showing 182 changed files with 3 additions and 4,854 deletions.
diff --git a/.github/workflows/auto-publish-snapshot.yml b/.github/workflows/auto-publish-snapshot.yml
@@ -26,4 +26,4 @@ jobs:
           JAVA_HOME: ${{ steps.setup-java.outputs.path }}
         run: |
           chmod u+x ./gradlew
-          ./gradlew publishMavenPublicationToStyxRepository publishDesktopPublicationToStyxRepository publishAndroidReleasePublicationToStyxRepository -Pversion=${{ env.SNAPSHOT_COMMIT }} -Dorg.gradle.parallel=false --stacktrace --no-configuration-cache
+          ./gradlew publishAllPublicationsToStyxRepository -Pversion=${{ env.SNAPSHOT_COMMIT }} -Dorg.gradle.parallel=false --stacktrace --no-configuration-cache
diff --git a/build-config/src/main/kotlin/configuration/configure-kotlin-android.gradle.kts b/build-config/src/main/kotlin/configuration/configure-kotlin-android.gradle.kts
diff --git a/build-config/src/main/kotlin/extensions/ProjectExtensions.kt b/build-config/src/main/kotlin/extensions/ProjectExtensions.kt
@@ -2,7 +2,6 @@ package extensions
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
-import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 fun Project.hasPlugin(id: String) = plugins.hasPlugin(id)
@@ -15,6 +14,3 @@ fun Project.isMultiplatformModule() = hasPlugin("org.jetbrains.kotlin.multiplatf
 
 fun Project.kotlinMultiplatform(block: KotlinMultiplatformExtension.() -> Unit) =
     extensions.configure<KotlinMultiplatformExtension>(block)
-
-fun Project.kotlinAndroid(block: KotlinAndroidExtension.() -> Unit) =
-    extensions.configure<KotlinAndroidExtension>(block)
diff --git a/build-config/src/main/kotlin/samples-module.gradle.kts b/build-config/src/main/kotlin/samples-module.gradle.kts
diff --git a/build-config/src/main/kotlin/voyager-android-module.gradle.kts b/build-config/src/main/kotlin/voyager-android-module.gradle.kts
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,14 +18,6 @@ plugins {
 }
 
 apiValidation {
-    with(ignoredProjects) {
-        add(projects.samples.android)
-        add(projects.samples.multiplatform)
-        add(projects.samples.multiModule.app)
-        add(projects.samples.multiModule.featureHome)
-        add(projects.samples.multiModule.featurePosts)
-        add(projects.samples.multiModule.navigation)
-    }
     with(nonPublicMarkers) {
         add("cafe.adriel.voyager.core.annotation.InternalVoyagerApi")
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 agp = "8.7.2"
-kotlin = "2.1.0"
+kotlin = "2.0.21"
 mavenPublish = "0.30.0"
 composeMultiplatform = "1.7.1"
 binaryCompatibilityValidator = "0.16.3"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/includes.gradle.kts b/includes.gradle.kts
@@ -1,12 +1,4 @@
 include(
-    ":samples:android",
-    ":samples:multiplatform",
-
-    ":samples:multi-module:app",
-    ":samples:multi-module:navigation",
-    ":samples:multi-module:feature-home",
-    ":samples:multi-module:feature-posts",
-
     ":voyager-core",
     ":voyager-screenmodel",
     ":voyager-navigator",

diff --git a/samples/android/build.gradle.kts b/samples/android/build.gradle.kts
diff --git a/samples/android/src/main/AndroidManifest.xml b/samples/android/src/main/AndroidManifest.xml
diff --git a/samples/android/src/main/java/cafe/adriel/voyager/sample/App.kt b/samples/android/src/main/java/cafe/adriel/voyager/sample/App.kt
diff --git a/samples/android/src/main/java/cafe/adriel/voyager/sample/SampleActivity.kt b/samples/android/src/main/java/cafe/adriel/voyager/sample/SampleActivity.kt