Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setup graphics-shapes publishing #1643

Merged
merged 4 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ artifactRedirecting.androidx.compose.material3.adaptive.version=1.1.0-alpha04
# We use artifactRedirecting not only for Compose libs:
artifactRedirecting.androidx.collection.version=1.5.0-alpha03
artifactRedirecting.androidx.annotation.version=1.9.0-beta01
artifactRedirecting.androidx.graphics.version=1.0.1
artifactRedirecting.androidx.lifecycle.version=2.9.0-alpha03
artifactRedirecting.androidx.navigation.version=2.8.0
artifactRedirecting.androidx.savedstate.version=1.3.0-alpha01
Expand All @@ -124,6 +125,7 @@ artifactRedirecting.androidx.window.version=1.4.0-alpha04
artifactRedirecting.modules-for-knative-manifest=\
:annotation:annotation=artifactRedirecting.androidx.annotation.version,\
:collection:collection=artifactRedirecting.androidx.collection.version,\
:graphics:graphics-shapes=artifactRedirecting.androidx.graphics.version,\
MatkovIvan marked this conversation as resolved.
Show resolved Hide resolved
:lifecycle:lifecycle-common=artifactRedirecting.androidx.lifecycle.version,\
:lifecycle:lifecycle-runtime=artifactRedirecting.androidx.lifecycle.version,\
:lifecycle:lifecycle-viewmodel=artifactRedirecting.androidx.lifecycle.version
Expand Down
18 changes: 18 additions & 0 deletions graphics/graphics-shapes/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# Copyright 2024 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

artifactRedirecting.publication.targetNames=android,desktop,iosArm64,iosSimulatorArm64,iosX64,linuxArm64,linuxX64,macosArm64,macosX64,tvosArm64,tvosSimulatorArm64,tvosX64,watchosArm32,watchosArm64,watchosSimulatorArm64,watchosX64
artifactRedirecting.androidx.groupId=androidx.graphics
MatkovIvan marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 2 additions & 1 deletion libraryversions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ GLANCE_WEAR_TILES = "1.0.0-alpha06"
GRAPHICS_CORE = "1.0.0"
GRAPHICS_FILTERS = "1.0.0-alpha01"
GRAPHICS_PATH = "1.0.0-rc01"
GRAPHICS_SHAPES = "1.0.0-rc01"
GRAPHICS_SHAPES = "1.0.1"
GRIDLAYOUT = "1.1.0-beta02"
HEALTH_CONNECT = "1.1.0-alpha09"
HEALTH_CONNECT_TESTING_QUARANTINE = "1.0.0-alpha01"
Expand Down Expand Up @@ -317,6 +317,7 @@ COLLECTION_JETBRAINS = { group = "org.jetbrains.compose.collection-internal", at

CORE_BUNDLE_JETBRAINS = { group = "org.jetbrains.androidx.core", atomicGroupVersion = "versions.CORE_BUNDLE", overrideInclude = [ ":core:core-bundle" ] }
CORE_URI_JETBRAINS = { group = "org.jetbrains.androidx.core", atomicGroupVersion = "versions.CORE_URI", overrideInclude = [ ":core:core-uri" ] }
GRAPHICS_SHAPES_JETBRAINS = { group = "org.jetbrains.androidx.graphics", atomicGroupVersion = "versions.GRAPHICS_SHAPES", overrideInclude = [ ":graphics:graphics-shapes" ] }
SAVEDSTATE_JETBRAINS = { group = "org.jetbrains.androidx.savedstate", atomicGroupVersion = "versions.SAVEDSTATE", overrideInclude = [ ":savedstate:savedstate" ] }
WINDOW_CORE_JETBRAINS = { group = "org.jetbrains.androidx.window", atomicGroupVersion = "versions.WINDOW", overrideInclude = [ ":window:window-core" ] }

Expand Down
7 changes: 7 additions & 0 deletions mpp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,13 @@ val libraryToComponents = mapOf(
ComposeComponent(":compose:material3:adaptive:adaptive-layout"),
ComposeComponent(":compose:material3:adaptive:adaptive-navigation"),
),
"GRAPHICS_SHAPES" to listOf(
ComposeComponent(
path = ":graphics:graphics-shapes",
// TODO: Maybe it makes sense to support mingwX64 here for consistency
supportedPlatforms = ComposePlatforms.ALL_AOSP - ComposePlatforms.WINDOWS_NATIVE
),
),
"LIFECYCLE" to listOf(
ComposeComponent(
path = ":lifecycle:lifecycle-common",
Expand Down
Loading