Skip to content

Commit

Permalink
Merge pull request #81 from teogor/deps/migrate-to-crosslens
Browse files Browse the repository at this point in the history
Migrate Project to CrossLens Library for Enhanced Composables and Utilities
  • Loading branch information
teogor authored Sep 4, 2024
2 parents ce30845 + afe820a commit bfa31fa
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 241 deletions.
3 changes: 1 addition & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ subprojects {

val excludedProjects = listOf<DelegatingProjectDependency>(
projects.sudoklify,
projects.sudoklify.demo.composeApp,
projects.sudoklify.demo,
)

apiValidation {
Expand All @@ -183,7 +183,6 @@ apiValidation {

subprojects {
val paths = excludedProjects.map { it.identityPath.path }
println("This is the path: $path for subproject: $path")
if (!paths.contains(this.path)) {
apply<DokkaPlugin>()
}
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ compose-plugin = "1.7.0-alpha03"
androidx-activity-compose = "1.9.1"
androidx-lifecycle = "2.8.0"
teogor-paletteon = "1.0.0-alpha01"
teogor-crosslens = "1.0.0-alpha02"

[libraries]
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
Expand All @@ -27,6 +28,7 @@ jetbrains-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.r
jetbrains-kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
jetbrains-kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "jetbrains-kotlinx-datetime" }
teogor-paletteon-core = { module = "dev.teogor.paletteon:paletteon-core", version.ref = "teogor-paletteon" }
teogor-crosslens-core = { module = "dev.teogor.crosslens:crosslens-core", version.ref = "teogor-crosslens" }

[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
Expand Down
15 changes: 0 additions & 15 deletions sudoklify-core/api/sudoklify-core.api
Original file line number Diff line number Diff line change
Expand Up @@ -282,18 +282,3 @@ public final class dev/teogor/sudoklify/util/BoardConversionsKt {
public static final fun toBoard (Ljava/lang/String;Ldev/teogor/sudoklify/components/Dimension;)[[Ljava/lang/String;
}

public final class dev/teogor/sudoklify/util/HashCodeBuilder {
public fun <init> ()V
public fun <init> (II)V
public synthetic fun <init> (IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun append (Ljava/lang/Object;)Ldev/teogor/sudoklify/util/HashCodeBuilder;
public final fun build ()I
}

public final class dev/teogor/sudoklify/util/HashCodeBuilderKt {
public static final fun buildHashCode (IILkotlin/jvm/functions/Function1;)I
public static synthetic fun buildHashCode$default (IILkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
public static final fun buildLazyHashCode (Lkotlin/jvm/functions/Function1;)Lkotlin/Lazy;
public static final fun lazyHashCode (Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
}

3 changes: 3 additions & 0 deletions sudoklify-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ kotlin {
val commonMain by getting {
dependencies {
implementation(libs.jetbrains.kotlinx.datetime)

implementation(libs.teogor.crosslens.core)

api(projects.sudoklifyCommon)
api(projects.sudoklifyTokenizer)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

package dev.teogor.sudoklify.schema

import dev.teogor.crosslens.core.buildLazyHashCode
import dev.teogor.sudoklify.ExperimentalSudoklifyApi
import dev.teogor.sudoklify.components.Difficulty
import dev.teogor.sudoklify.components.Dimension
import dev.teogor.sudoklify.tokenizer.SudokuString
import dev.teogor.sudoklify.tokenizer.toSudokuString
import dev.teogor.sudoklify.util.buildLazyHashCode

/**
* Represents a schema for generating Sudoku puzzles.
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit bfa31fa

Please sign in to comment.