Skip to content

Commit

Permalink
refactor: switch own implementation with jetbrains internal androidx …
Browse files Browse the repository at this point in the history 
…clones (annotation, collection).
  • Loading branch information
@Lavmee
Lavmee committed May 21, 2024
1 parent cb0cf29 commit b02281b
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 153 deletions.
2 changes: 2 additions & 0 deletions compose/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ kotlin {
implementation(compose.foundation)
implementation(compose.runtime)
implementation(libs.kotlin.stdlib)
implementation(libs.annotation)
implementation(libs.collection)
implementation(kotlin("reflect"))
}
}
Expand Down
2 changes: 1 addition & 1 deletion compose/src/commonMain/kotlin/androidx/constraintlayout/compose/ConstrainScope.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

package androidx.constraintlayout.compose

import androidx.annotation.FloatRange
import androidx.compose.foundation.layout.LayoutScopeMarker
import androidx.compose.runtime.Stable
import androidx.compose.ui.graphics.TransformOrigin
import androidx.compose.ui.layout.FirstBaseline
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.constraintlayout.compose.platform.annotation.FloatRange
import androidx.constraintlayout.core.parser.CLArray
import androidx.constraintlayout.core.parser.CLNumber
import androidx.constraintlayout.core.parser.CLObject
Expand Down
2 changes: 1 addition & 1 deletion compose/src/commonMain/kotlin/androidx/constraintlayout/compose/ConstraintLayout.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package androidx.constraintlayout.compose

import androidx.collection.IntIntPair
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.AnimationSpec
import androidx.compose.animation.core.tween
Expand Down Expand Up @@ -77,7 +78,6 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.util.fastForEach
import androidx.compose.ui.util.fastForEachIndexed
import androidx.constraintlayout.compose.extra.IntIntPair
import androidx.constraintlayout.compose.extra.parseLong
import androidx.constraintlayout.compose.extra.rememberEmptyPainter
import androidx.constraintlayout.compose.platform.Log
Expand Down
4 changes: 2 additions & 2 deletions compose/src/commonMain/kotlin/androidx/constraintlayout/compose/TransitionScope.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

package androidx.constraintlayout.compose

import androidx.annotation.FloatRange
import androidx.annotation.IntRange
import androidx.compose.foundation.layout.LayoutScopeMarker
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.constraintlayout.compose.platform.annotation.FloatRange
import androidx.constraintlayout.compose.platform.annotation.IntRange
import androidx.constraintlayout.core.parser.CLArray
import androidx.constraintlayout.core.parser.CLContainer
import androidx.constraintlayout.core.parser.CLNumber
Expand Down
88 changes: 0 additions & 88 deletions compose/src/commonMain/kotlin/androidx/constraintlayout/compose/extra/IntIntPair.kt
View file

This file was deleted.

21 changes: 0 additions & 21 deletions ...src/commonMain/kotlin/androidx/constraintlayout/compose/platform/annotation/FloatRange.kt
View file

This file was deleted.

19 changes: 0 additions & 19 deletions ...e/src/commonMain/kotlin/androidx/constraintlayout/compose/platform/annotation/IntRange.kt
View file

This file was deleted.

4 changes: 4 additions & 0 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

androidx-appcompat = "1.6.1"
androidx-activityCompose = "1.9.0"
annotation = "1.8.0-alpha01"
collection = "1.6.10"
compose = "1.6.10"
kotlin = "1.9.24"
agp = "8.2.2"
Expand All @@ -12,6 +14,8 @@ spotless = "6.25.0"

androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
androidx-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
annotation = { module = "org.jetbrains.compose.annotation-internal:annotation", version.ref = "annotation" }
collection = { module = "org.jetbrains.compose.collection-internal:collection", version.ref = "collection" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }

[plugins]
Expand Down
Empty file modified gradlew
100644 → 100755
View file
Empty file.
44 changes: 23 additions & 21 deletions sample/iosApp/iosApp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 56;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -13,7 +13,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
A93A953729CC810C00F8E227 /* constraintlayout-compose-multiplatform.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "constraintlayout-compose-multiplatform.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A93A953729CC810C00F8E227 /* constraintlayout-compose-multiplatform.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "constraintlayout-compose-multiplatform.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A93A953A29CC810C00F8E227 /* iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosApp.swift; sourceTree = "<group>"; };
A93A953E29CC810D00F8E227 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
A93A954129CC810D00F8E227 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -153,7 +153,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd \"$SRCROOT/../..\"\n./gradlew :sample:shared:embedAndSignAppleFrameworkForXcode\n";
shellScript = "\ncd \"$SRCROOT/../..\"\n\nchmod +x ./gradlew\n\n./gradlew :sample:shared:embedAndSignAppleFrameworkForXcode\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -291,11 +291,12 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
DEVELOPMENT_TEAM = D4RT859GVR;
ENABLE_PREVIEWS = YES;
FRAMEWORK_SEARCH_PATHS = (
"${inherited}",
"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
);
FRAMEWORK_SEARCH_PATHS = (
"${inherited}",
"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
);
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
Expand All @@ -307,11 +308,11 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = (
"${inherited}",
"-framework",
shared,
);
OTHER_LDFLAGS = (
"${inherited}",
"-framework",
shared,
);
PRODUCT_BUNDLE_IDENTIFIER = tech.annexflow.sample.iosApp;
PRODUCT_NAME = "constraintlayout-compose-multiplatform";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -328,11 +329,12 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
DEVELOPMENT_TEAM = D4RT859GVR;
ENABLE_PREVIEWS = YES;
FRAMEWORK_SEARCH_PATHS = (
"${inherited}",
"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
);
FRAMEWORK_SEARCH_PATHS = (
"${inherited}",
"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
);
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
Expand All @@ -344,11 +346,11 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = (
"${inherited}",
"-framework",
shared,
);
OTHER_LDFLAGS = (
"${inherited}",
"-framework",
shared,
);
PRODUCT_BUNDLE_IDENTIFIER = tech.annexflow.sample.iosApp;
PRODUCT_NAME = "constraintlayout-compose-multiplatform";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down

0 comments on commit b02281b

Please sign in to comment.