Skip to content

Commit

Permalink
Merge branch 'main' into annexflow-repackage
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
Lavmee committed Jan 26, 2025
2 parents 1dc156a + 3f822b7 commit 2beb99e
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ Pods/
*.jks
*yarn.lock
/.kotlin/
/.run/
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ allprojects {
}

extra.apply {
set("jvmTarget", "11")
set("jvmTarget", "1.8")
}
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.launch
import kotlin.experimental.ExperimentalObjCRefinement
import kotlin.native.HiddenFromObjC

/**
* Layout that positions its children according to the constraints between them.
Expand Down Expand Up @@ -2251,6 +2253,8 @@ internal fun Placeable.PlacementScope.placeWithFrameTransform(
}
}

@OptIn(ExperimentalObjCRefinement::class)
@HiddenFromObjC
object DesignElements {
var map = HashMap<String, @Composable (String, HashMap<String, String>) -> Unit>()

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ SONATYPE_CONNECT_TIMEOUT_SECONDS=600
SONATYPE_CLOSE_TIMEOUT_SECONDS=1800

GROUP=tech.annexflow.compose
VERSION_NAME=0.5.0-shaded
VERSION_NAME=0.5.1-shaded

POM_URL=https://github.com/lavmee/constraintlayout-compose-multiplatform/
POM_SCM_URL=https://github.com/lavmee/constraintlayout-compose-multiplatform/
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[versions]

androidx-appcompat = "1.7.0"
androidx-activityCompose = "1.9.3"
androidx-activityCompose = "1.10.0"
annotation = "1.9.0"
compose = "1.7.0"
kotlin = "2.0.21"
agp = "8.5.2"
compose = "1.7.3"
kotlin = "2.1.0"
agp = "8.8.0"
maven-publish = "0.30.0"
spotless = "6.25.0"

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 2beb99e

Please sign in to comment.