Skip to content
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
4 changes: 2 additions & 2 deletions 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-9.5.0-rc-1-bin.zip
distributionSha256Sum=66d79b10eb939c954bf1ac3be9d9cde985301b56058d49542286c35782ae1e74
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
distributionSha256Sum=553c78f50dafcd54d65b9a444649057857469edf836431389695608536d6b746
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions mpp/docs/Stubbed Projects.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
- `:lifecycle:lifecycle-viewmodel-compose` is stubbed by `lifecycle/lifecycle-viewmodel-compose-compatibility-stub`, it depends on `androidx.lifecycle:lifecycle-viewmodel-compose`
- `:lifecycle:lifecycle-viewmodel-navigation3` is stubbed by `lifecycle/lifecycle-viewmodel-navigation3-compatibility-stub`, it depends on `androidx.lifecycle:lifecycle-viewmodel-navigation3`
- `:lifecycle:lifecycle-viewmodel-savedstate` is stubbed by `lifecycle/lifecycle-viewmodel-savedstate-compatibility-stub`, it depends on `androidx.lifecycle:lifecycle-viewmodel-savedstate`
- `:navigation:navigation-common` is stubbed by `navigation/navigation-common-compatibility-stub`, it depends on `androidx.navigation:navigation-common`
- `:navigation:navigation-runtime` is stubbed by `navigation/navigation-runtime-compatibility-stub`, it depends on `androidx.navigation:navigation-runtime`
- `:navigationevent:navigationevent-compose` is stubbed by `navigationevent/navigationevent-compose-compatibility-stub`, it depends on `androidx.navigationevent:navigationevent-compose`
- `:savedstate:savedstate` is stubbed by `savedstate/savedstate-compatibility-stub`, it depends on `androidx.savedstate:savedstate`
- `:savedstate:savedstate-compose` is stubbed by `savedstate/savedstate-compose-compatibility-stub`, it depends on `androidx.savedstate:savedstate-compose`
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Klib ABI Dump
// Targets: [iosArm64, iosSimulatorArm64, js, linuxArm64, linuxX64, macosArm64, tvosArm64, tvosSimulatorArm64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64]
// Rendering settings:
// - Signature version: 2
// - Show manifest properties: true
// - Show declarations: true

// Library unique name: <org.jetbrains.androidx.navigation:navigation-common>
63 changes: 63 additions & 0 deletions navigation/navigation-common-compatibility-stub/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/*
* Copyright 2026 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.
*/

import androidx.build.PlatformIdentifier
import androidx.build.SoftwareType

plugins {
id("AndroidXPlugin")
id("JetBrainsAndroidXPlugin")
}

androidXMultiplatform {
androidLibrary {
namespace = "androidx.navigation.common"
}
desktop()
linux()
mac()
watchos()
tvos()
ios()
js()
wasmJs()

defaultPlatform(PlatformIdentifier.ANDROID)

sourceSets {
commonMain {
dependencies {
def version = project.findProperty("artifactRedirection.version.androidx.navigation")
api("androidx.navigation:navigation-common:$version")

// Keep direct references to fork versions to correctly resolve
// new redirections to Google's artifacts.
api("org.jetbrains.androidx.lifecycle:lifecycle-common:2.11.0-beta01")
api("org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.11.0-beta01")
api("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.11.0-beta01")
api("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.11.0-beta01")
api("org.jetbrains.androidx.savedstate:savedstate:1.4.0")
}
}
}
}

androidx {
name = "Navigation Common"
type = SoftwareType.PUBLISHED_LIBRARY
inceptionYear = "2017"
description = "Android Navigation-Common"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2024 The Android Open Source Project
# Copyright 2026 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.
Expand All @@ -15,4 +15,4 @@
#

# TODO Determine redirection group based on package and remove explicit config
artifactRedirection.groupId=androidx.navigation
artifactRedirection.groupId=androidx.navigation
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright 2026 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.
*/

// We prefer to have no source code here, but a module can't be empty.
// We use this module to publish a dumb klib to be provided to the compilation of user projects.
// It's needed because Kotlin tries to resolve the dependencies listed in klib manifest.
// There is an intention to drop this behavior: https://youtrack.jetbrains.com/issue/KT-61096
// The actual klib is published at androidx maven coordinates in Google maven.
// This module depends on the actual klib, so the module API will be available transitively.
10 changes: 5 additions & 5 deletions navigation/navigation-compose/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ androidXMultiplatform {
implementation("org.jetbrains.compose.animation:animation-core:1.10.0")
implementation("org.jetbrains.compose.foundation:foundation-layout:1.10.0")
implementation("androidx.collection:collection:1.5.0")
implementation(project(":lifecycle:lifecycle-common"))
implementation(project(":lifecycle:lifecycle-runtime-compose"))
implementation(project(":lifecycle:lifecycle-viewmodel-savedstate"))
implementation(project(":lifecycle:lifecycle-viewmodel"))
implementation(project(":lifecycle:lifecycle-viewmodel-compose"))
implementation("org.jetbrains.androidx.lifecycle:lifecycle-common:2.11.0-beta01")
implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.11.0-beta01")
implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.11.0-beta01")
implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.11.0-beta01")
implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0-beta01")
implementation("androidx.savedstate:savedstate:1.4.0")
implementation("androidx.savedstate:savedstate-compose:1.4.0")
implementation(libs.kotlinCoroutinesCore)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Klib ABI Dump
// Targets: [iosArm64, iosSimulatorArm64, js, linuxArm64, linuxX64, macosArm64, tvosArm64, tvosSimulatorArm64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64]
// Rendering settings:
// - Signature version: 2
// - Show manifest properties: true
// - Show declarations: true

// Library unique name: <org.jetbrains.androidx.navigation:navigation-runtime>
62 changes: 62 additions & 0 deletions navigation/navigation-runtime-compatibility-stub/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
* Copyright 2026 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.
*/

import androidx.build.PlatformIdentifier
import androidx.build.SoftwareType

plugins {
id("AndroidXPlugin")
id("JetBrainsAndroidXPlugin")
}

androidXMultiplatform {
androidLibrary {
namespace = "androidx.navigation"
}
desktop()
linux()
mac()
watchos()
tvos()
ios()
js()
wasmJs()

defaultPlatform(PlatformIdentifier.ANDROID)

sourceSets {
commonMain {
dependencies {
def version = project.findProperty("artifactRedirection.version.androidx.navigation")
api("androidx.navigation:navigation-runtime:$version")

// Keep direct references to fork versions to correctly resolve
// new redirections to Google's artifacts.
api(project(":navigation:navigation-common"))
api("org.jetbrains.androidx.lifecycle:lifecycle-common:2.11.0-beta01")
api("org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.11.0-beta01")
api("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.11.0-beta01")
}
}
}
}

androidx {
name = "Navigation Runtime"
type = SoftwareType.PUBLISHED_LIBRARY
inceptionYear = "2017"
description = "Android Navigation-Runtime"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2024 The Android Open Source Project
# Copyright 2026 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright 2026 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.
*/

// We prefer to have no source code here, but a module can't be empty.
// We use this module to publish a dumb klib to be provided to the compilation of user projects.
// It's needed because Kotlin tries to resolve the dependencies listed in klib manifest.
// There is an intention to drop this behavior: https://youtrack.jetbrains.com/issue/KT-61096
// The actual klib is published at androidx maven coordinates in Google maven.
// This module depends on the actual klib, so the module API will be available transitively.
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,8 @@ includeProject(":lifecycle:lifecycle-viewmodel", "lifecycle/lifecycle-viewmodel-
includeProject(":lifecycle:lifecycle-viewmodel-compose", "lifecycle/lifecycle-viewmodel-compose-compatibility-stub")
includeProject(":lifecycle:lifecycle-viewmodel-navigation3", "lifecycle/lifecycle-viewmodel-navigation3-compatibility-stub")
includeProject(":lifecycle:lifecycle-viewmodel-savedstate", "lifecycle/lifecycle-viewmodel-savedstate-compatibility-stub")
includeProject(":navigation:navigation-common", "navigation/navigation-common-compatibility-stub")
includeProject(":navigation:navigation-runtime", "navigation/navigation-runtime-compatibility-stub")
includeProject(":navigationevent:navigationevent-compose", "navigationevent/navigationevent-compose-compatibility-stub")
includeProject(":savedstate:savedstate", "savedstate/savedstate-compatibility-stub")
includeProject(":savedstate:savedstate-compose", "savedstate/savedstate-compose-compatibility-stub")
Expand Down Expand Up @@ -534,9 +536,7 @@ includeProject(":lifecycle:lifecycle-runtime-lint")
includeProject(":lifecycle:lifecycle-runtime-testing")
includeProject(":lifecycle:lifecycle-runtime-testing-lint")
includeProject(":lifecycle:lifecycle-viewmodel-testing")
includeProject(":navigation:navigation-common")
includeProject(":navigation:navigation-compose")
includeProject(":navigation:navigation-runtime")
includeProject(":navigation:navigation-testing")
includeProject(":navigation3:navigation3-ui")

Expand Down
Loading