Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
aacfb95
Make bearing a clockwise map rotation (#6)
wf9a5m75 Sep 12, 2026
3e528ef
Pass declutterPx through to the marker tile renderer
wf9a5m75 Sep 21, 2026
1b3f4bb
Add LongdoDesign.None and keep raster layers across a base switch
wf9a5m75 Sep 29, 2026
ae109e3
update dependencies (#7)
wf9a5m75 Oct 5, 2026
5cd71bd
Pick the tiled marker drawn under the tap, label included (#8)
wf9a5m75 Oct 23, 2026
71fd52c
Vector style support and raster layers across style swaps (#9)
wf9a5m75 Oct 24, 2026
ba5a453
Add .claude/settings.json
wf9a5m75 Oct 28, 2026
e60a606
Redraw a marker when its URL icon's image arrives
wf9a5m75 Nov 6, 2026
300aeb0
Key the marker bitmap on iconRevision
wf9a5m75 Nov 6, 2026
9707c7b
Merge pull request #10 from MapConductor/feat/image-icon-url
wf9a5m75 Nov 6, 2026
112b6e0
Keep the map design across configuration changes
wf9a5m75 Nov 7, 2026
43cf892
Merge pull request #11 from MapConductor/fix/saver-state
wf9a5m75 Nov 7, 2026
8f7ffc6
Draw large polygon sets as raster tiles (PolygonTiler)
wf9a5m75 Nov 7, 2026
2a46b29
hasMarker: look ids up in a set instead of scanning the list
wf9a5m75 Nov 7, 2026
d38827c
Destroy the WebView when the map leaves the composition
wf9a5m75 Nov 7, 2026
a9479f2
Read the controller through the state base, which MapViewBase clears
wf9a5m75 Nov 8, 2026
536443b
Hold onAdded until the layers are on the page's map
wf9a5m75 Nov 8, 2026
4e3cee4
Detach the controller from the state when the map is disposed
wf9a5m75 Nov 8, 2026
f7844fe
Merge pull request #12 from MapConductor/fix/mapview-teardown
wf9a5m75 Nov 8, 2026
cd63b5d
Clear strategy markers in clearOverlays()
wf9a5m75 Nov 8, 2026
2481945
Stack overlays by band inside the Longdo renderer
wf9a5m75 Nov 8, 2026
01ab1cb
Merge pull request #13 from MapConductor/fix/clear-strategy
wf9a5m75 Nov 8, 2026
e3c801c
Merge pull request #14 from MapConductor/fix/overlay-stacking-order
wf9a5m75 Nov 8, 2026
beb706e
Merge remote-tracking branch 'origin/develop' into feat/polygon-tiling
wf9a5m75 Nov 9, 2026
2bc77c3
Stack the polygon tiles at the bottom of the polygon band
wf9a5m75 Nov 9, 2026
639f94f
Update the API baseline
wf9a5m75 Nov 9, 2026
657c6a5
Merge branch 'feat/polygon-tiling' into feat/overlay-on-added
wf9a5m75 Nov 9, 2026
9a148ab
Update the API baseline
wf9a5m75 Nov 9, 2026
0676afb
Merge pull request #15 from MapConductor/feat/polygon-tiling
wf9a5m75 Nov 9, 2026
2c722a8
Draw large polyline sets as raster tiles (PolylineTiler)
wf9a5m75 Nov 9, 2026
e9c28f1
Merge pull request #16 from MapConductor/feat/polyline-tiling
wf9a5m75 Nov 10, 2026
bd15543
Support bulk Circles with raster tiles
wf9a5m75 Nov 11, 2026
ff49445
Merge pull request #17 from MapConductor/feat/circles-bulk-cache
wf9a5m75 Nov 11, 2026
6ca917b
Draw marker overlays in MarkerDrawOrder
wf9a5m75 Nov 11, 2026
b11229f
Reorder marker overlays when the map rotates
wf9a5m75 Nov 11, 2026
26a0d7a
Merge pull request #18 from MapConductor/fix/marker-zindex-order
wf9a5m75 Nov 12, 2026
58b76f7
Apply camera paddings and report fov on Longdo
wf9a5m75 Nov 12, 2026
406ee80
Merge remote-tracking branch 'origin/develop' into feat/camera-paddings
wf9a5m75 Nov 12, 2026
af45c58
Merge pull request #19 from MapConductor/feat/camera-paddings
wf9a5m75 Nov 12, 2026
ab16edc
Pass the camera's field of view to the screen projection
wf9a5m75 Nov 12, 2026
70aada5
Merge pull request #20 from MapConductor/fix/longdo-screen-offset
wf9a5m75 Nov 12, 2026
e660018
Release 1.4.0
wf9a5m75 Nov 13, 2026
bb768fd
Merge pull request #21 from MapConductor/release/1.4.0
wf9a5m75 Nov 13, 2026
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
6 changes: 6 additions & 0 deletions .claude/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"attribution": {
"commit": "",
"pr": ""
}
}
25 changes: 23 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,29 @@ jobs:
cache: 'gradle'

- name: Build core and compose locally
env:
HEAD_REF: ${{ github.head_ref }}
run: |
git clone --depth 1 https://github.com/MapConductor/android-sdk-core.git _core
# コア側に PR と同名のブランチがあるなら、そちらを組む。
#
# ここを default ブランチ固定にしていると、**コアの未マージな変更に追随する
# PR は永久に赤いまま**になる。実際 CameraBearing をコアへ足したとき、
# プロバイダ側の PR が 10 本まとめて Unresolved reference で落ちた。
# コアが先にマージされるまで待つ、という運用は取り込み順の事故を呼ぶので、
# 同名ブランチがあれば拾う形にしてある(無ければ従来どおり default)。
clone_matching() {
repo="$1"; dir="$2"
url="https://github.com/MapConductor/$repo.git"
if [ -n "$HEAD_REF" ] && git ls-remote --exit-code --heads "$url" "$HEAD_REF" >/dev/null 2>&1; then
echo "$repo: matching branch $HEAD_REF"
git clone --depth 1 --branch "$HEAD_REF" "$url" "$dir"
else
echo "$repo: default branch"
git clone --depth 1 "$url" "$dir"
fi
}

clone_matching android-sdk-core _core
cd _core
./gradlew --no-daemon publishToMavenLocal
cd ..
Expand All @@ -53,7 +74,7 @@ jobs:
}
EOF

git clone --depth 1 https://github.com/MapConductor/android-sdk-compose.git _compose
clone_matching android-sdk-compose _compose
cd _compose
./gradlew --no-daemon publishToMavenLocal
cd ..
Expand Down
42 changes: 39 additions & 3 deletions api/android-for-longdo.api
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public final class com.mapconductor.longdo.LongdoDesign implements com.mapconduc
public java.lang.Object getValue();
}
public final class com.mapconductor.longdo.LongdoDesign$Companion {
public final com.mapconductor.longdo.LongdoDesign getNone();
public final com.mapconductor.longdo.LongdoDesign getNormal();
public final com.mapconductor.longdo.LongdoDesign getEasy();
public final com.mapconductor.longdo.LongdoDesign getPastel();
Expand Down Expand Up @@ -105,6 +106,8 @@ public final class com.mapconductor.longdo.LongdoMapViewController extends com.m
public void setOnMarkerClickListener(kotlin.jvm.functions.Function1<? super com.mapconductor.core.marker.MarkerState, kotlin.Unit>);
public java.lang.Object compositionRasterLayers(java.util.List<com.mapconductor.core.raster.RasterLayerState>, kotlin.coroutines.Continuation<? super kotlin.Unit>);
public java.lang.Object updateRasterLayer(com.mapconductor.core.raster.RasterLayerState, kotlin.coroutines.Continuation<? super kotlin.Unit>);
public void mountRasterLayer(com.mapconductor.core.raster.RasterLayerState);
public void unmountRasterLayer(java.lang.String);
public boolean hasRasterLayer(com.mapconductor.core.raster.RasterLayerState);
public boolean hasPolyline(com.mapconductor.core.polyline.PolylineState);
public void setOnPolylineClickListener(kotlin.jvm.functions.Function1<? super com.mapconductor.core.polyline.PolylineEvent, kotlin.Unit>);
Expand All @@ -120,7 +123,9 @@ public final class com.mapconductor.longdo.LongdoMapViewController extends com.m
public final class com.mapconductor.longdo.LongdoMapViewController$Companion {
}
public final class com.mapconductor.longdo.LongdoMapViewControllerCameraKt {
public static final double LONGDO_VERTICAL_FOV;
public static final boolean applyCameraRestrictionCorrectionIfNeeded(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.map.MapCameraPosition);
public static final double viewportHeightDp(com.mapconductor.longdo.LongdoMapViewController);
public static final void handleMoveCamera(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.map.MapCameraPosition);
public static final void handleAnimateCamera(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.map.MapCameraPosition, long);
public static final void applyCamera(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.map.MapCameraPosition);
Expand All @@ -140,14 +145,16 @@ public final class com.mapconductor.longdo.LongdoMapViewControllerMarkerTilesKt
public static final void renderTiledMarkers(com.mapconductor.longdo.LongdoMapViewController, java.util.List<com.mapconductor.core.marker.MarkerState>);
public static final void applyMarkerTileRaster(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.raster.RasterLayerState);
public static final void removeMarkerTileRaster(com.mapconductor.longdo.LongdoMapViewController);
public static final boolean handleMarkerTap(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.features.GeoPoint, double);
public static final boolean handleMarkerTap(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.features.GeoPoint);
}
public final class com.mapconductor.longdo.LongdoMapViewControllerRasterKt {
public static final void applyRaster(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.raster.RasterLayerState);
public static final void runRasterJs(com.mapconductor.longdo.LongdoMapViewController, java.lang.String);
public static final java.lang.String rasterSourceSpec(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.raster.RasterLayerSource);
public static final java.lang.String rasterLayerSpec(com.mapconductor.longdo.LongdoMapViewController, java.lang.String, java.lang.String, float, boolean);
public static final java.lang.String addRasterJs(com.mapconductor.longdo.LongdoMapViewController, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
public static final java.lang.String addRasterJs(com.mapconductor.longdo.LongdoMapViewController, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
public static final java.lang.String readdRastersAfterStyleSwapJs(com.mapconductor.longdo.LongdoMapViewController, java.util.List<com.mapconductor.core.raster.RasterLayerState>);
public static final java.lang.String removeRasterJs(com.mapconductor.longdo.LongdoMapViewController, java.lang.String);
public static final java.lang.String setRasterOpacityJs(com.mapconductor.longdo.LongdoMapViewController, java.lang.String, float);
public static final java.lang.String setRasterVisibilityJs(com.mapconductor.longdo.LongdoMapViewController, java.lang.String, boolean);
Expand All @@ -164,12 +171,15 @@ public final class com.mapconductor.longdo.LongdoMapViewHolder implements com.ma
public androidx.compose.ui.geometry.Offset toScreenOffset-x-9fifI(com.mapconductor.core.features.GeoPointInterface);
public com.mapconductor.core.features.GeoPoint fromScreenOffsetSync-k-4lQ0M(long);
public java.lang.Object fromScreenOffset-3MmeM6k(long, kotlin.coroutines.Continuation<? super com.mapconductor.core.features.GeoPoint>);
public com.mapconductor.core.projection.ProjectedPoint toProjectedPoint(com.mapconductor.core.features.GeoPointInterface);
public com.mapconductor.core.features.GeoPoint fromProjectedPoint(com.mapconductor.core.projection.ProjectedPoint);
public com.mapconductor.core.projection.MapCoordinateSystem getCoordinateSystem();
public java.lang.Object getMapView();
public java.lang.Object getMap();
}
public final class com.mapconductor.longdo.LongdoMapViewKt {
public static final void LongdoMapView(com.mapconductor.longdo.LongdoViewState, androidx.compose.ui.Modifier, com.mapconductor.core.marker.MarkerTilingOptions, com.mapconductor.core.map.CameraRestriction, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapViewStateInterface<?>, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPoint, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPoint, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function3<? super com.mapconductor.compose.MapViewScope, ? super androidx.compose.runtime.Composer, ? super java.lang.Integer, kotlin.Unit>, androidx.compose.runtime.Composer, int, int, int);
public static final void LongdoMapSurface(com.mapconductor.longdo.LongdoViewState, androidx.compose.ui.Modifier, com.mapconductor.core.marker.MarkerTilingOptions, com.mapconductor.core.map.CameraRestriction, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapViewStateInterface<?>, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPoint, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPoint, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.longdo.LongdoMapViewController, kotlin.Unit>, kotlin.jvm.functions.Function3<? super com.mapconductor.compose.MapViewScope, ? super androidx.compose.runtime.Composer, ? super java.lang.Integer, kotlin.Unit>, androidx.compose.runtime.Composer, int, int, int);
public static final void LongdoMapView(com.mapconductor.longdo.LongdoViewState, androidx.compose.ui.Modifier, com.mapconductor.core.marker.MarkerTilingOptions, com.mapconductor.core.map.CameraRestriction, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapViewStateInterface<?>, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPoint, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPoint, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, com.mapconductor.core.map.MapViewStyle, kotlin.jvm.functions.Function1<? super java.util.List<java.lang.String>, kotlin.Unit>, kotlin.jvm.functions.Function3<? super com.mapconductor.compose.MapViewScope, ? super androidx.compose.runtime.Composer, ? super java.lang.Integer, kotlin.Unit>, androidx.compose.runtime.Composer, int, int, int);
public static final void LongdoMapSurface(com.mapconductor.longdo.LongdoViewState, androidx.compose.ui.Modifier, com.mapconductor.core.marker.MarkerTilingOptions, com.mapconductor.core.map.CameraRestriction, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapViewStateInterface<?>, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPoint, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPoint, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.longdo.LongdoMapViewController, kotlin.Unit>, com.mapconductor.core.map.MapViewStyle, kotlin.jvm.functions.Function1<? super java.util.List<java.lang.String>, kotlin.Unit>, kotlin.jvm.functions.Function3<? super com.mapconductor.compose.MapViewScope, ? super androidx.compose.runtime.Composer, ? super java.lang.Integer, kotlin.Unit>, androidx.compose.runtime.Composer, int, int, int);
}
public final class com.mapconductor.longdo.LongdoMapViewSaver extends com.mapconductor.compose.map.BaseMapViewSaver<com.mapconductor.longdo.LongdoViewState> {
public static final java.lang.String KEY_DESIGN_ID;
Expand All @@ -186,6 +196,14 @@ final class com.mapconductor.longdo.LongdoMapViewSaver$Companion {
public final class com.mapconductor.longdo.LongdoMapViewScope extends com.mapconductor.compose.MapViewScope {
public com.mapconductor.longdo.LongdoMapViewScope();
}
public final class com.mapconductor.longdo.LongdoOverlayStacking {
public static final com.mapconductor.longdo.LongdoOverlayStacking INSTANCE;
public final java.lang.String addLayerJs(java.lang.String, com.mapconductor.core.controller.OverlayKind, int);
public final java.lang.String addPolygonTileLayerJs(java.lang.String);
public final java.lang.String addCircleTileLayerJs(java.lang.String);
public final java.lang.String addPolylineTileLayerJs(java.lang.String);
public final java.lang.String addMarkerTileLayerJs(java.lang.String);
}
public final class com.mapconductor.longdo.LongdoOverlayState {
public com.mapconductor.longdo.LongdoOverlayState();
public final androidx.compose.runtime.snapshots.SnapshotStateMap<java.lang.String, androidx.compose.ui.geometry.Offset> getRenderPx();
Expand Down Expand Up @@ -223,6 +241,18 @@ public final class com.mapconductor.longdo.NativeCamera {
public int hashCode();
public boolean equals(java.lang.Object);
}
public final class com.mapconductor.longdo.PageLayerWait {
public static final com.mapconductor.longdo.PageLayerWait INSTANCE;
public static final java.lang.String MAP_EXPR;
public static final long TIMEOUT_MS;
public static final long INTERVAL_MS;
public final java.lang.String script(java.util.List<java.lang.String>);
public final int parse(java.lang.String);
public final java.lang.Object await(java.util.List<java.lang.String>, long, long, kotlin.jvm.functions.Function2<? super java.lang.String, ? super kotlin.coroutines.Continuation<? super java.lang.String>, ? extends java.lang.Object>, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
}
public final class com.mapconductor.longdo.PageLayerWaitKt {
public static final java.lang.Object awaitPageLayers(com.longdo.sdk3.LongdoMap, java.util.List<java.lang.String>, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
}
public final class com.mapconductor.longdo.circle.LongdoCircleController extends com.mapconductor.core.circle.CircleController<com.mapconductor.longdo.circle.LongdoCircleHandle> {
public com.mapconductor.longdo.circle.LongdoCircleController(com.mapconductor.longdo.circle.LongdoCircleOverlayRenderer, com.mapconductor.core.circle.CircleManagerInterface<com.mapconductor.longdo.circle.LongdoCircleHandle>);
public com.mapconductor.longdo.circle.LongdoCircleController(com.mapconductor.longdo.circle.LongdoCircleOverlayRenderer, com.mapconductor.core.circle.CircleManagerInterface, int, kotlin.jvm.internal.DefaultConstructorMarker);
Expand Down Expand Up @@ -327,6 +357,7 @@ public final class com.mapconductor.longdo.marker.LongdoClusterMarkerRenderer im
public java.lang.Object onPostProcess(kotlin.coroutines.Continuation<? super kotlin.Unit>);
public void onDragSelectionChanged(com.mapconductor.core.marker.MarkerEntityInterface<java.lang.Object>, com.mapconductor.core.marker.MarkerEntityInterface<java.lang.Object>);
public void onDragPositionChanged(com.mapconductor.core.features.GeoPointInterface);
public java.lang.Object onDrawOrderFrameChanged(com.mapconductor.core.marker.MarkerDrawOrder$Frame, java.util.List<? extends com.mapconductor.core.marker.MarkerEntityInterface<java.lang.Object>>, kotlin.coroutines.Continuation<? super kotlin.Unit>);
}
public final class com.mapconductor.longdo.marker.LongdoMarkerTileRenderer {
public static final double TILE_SIZE;
Expand All @@ -338,10 +369,15 @@ public final class com.mapconductor.longdo.marker.LongdoMarkerTileRenderer {
public final com.mapconductor.core.raster.RasterLayerState render(java.util.List<com.mapconductor.core.marker.MarkerState>);
public final java.lang.String getRasterLayerId();
public final void clear();
public final com.mapconductor.core.marker.MarkerState findMarkerAt(com.mapconductor.core.features.GeoPointInterface, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPointInterface, androidx.compose.ui.geometry.Offset>);
public final com.mapconductor.core.marker.MarkerState findMarkerAt(com.mapconductor.core.features.GeoPointInterface, double);
}
final class com.mapconductor.longdo.marker.LongdoMarkerTileRenderer$Companion {
}
public final class com.mapconductor.longdo.marker.MarkerIdIndex {
public com.mapconductor.longdo.marker.MarkerIdIndex();
public final synchronized boolean contains(java.util.List<com.mapconductor.core.marker.MarkerState>, java.lang.String);
}
public final class com.mapconductor.longdo.polygon.LongdoPolygonController extends com.mapconductor.core.polygon.PolygonController<com.mapconductor.longdo.polygon.LongdoPolygonHandle> {
public com.mapconductor.longdo.polygon.LongdoPolygonController(com.mapconductor.longdo.polygon.LongdoPolygonOverlayRenderer, com.mapconductor.core.polygon.PolygonManagerInterface<com.mapconductor.longdo.polygon.LongdoPolygonHandle>);
public com.mapconductor.longdo.polygon.LongdoPolygonController(com.mapconductor.longdo.polygon.LongdoPolygonOverlayRenderer, com.mapconductor.core.polygon.PolygonManagerInterface, int, kotlin.jvm.internal.DefaultConstructorMarker);
Expand Down
5 changes: 5 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ dependencies {
} else {
api("com.mapconductor:compose:$libraryVersion")
}

testImplementation(libs.junit)
// Saver の保存 → 復元を実機の Bundle / Parcel で確かめる(SaverRoundTripTest)。
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
}

// Set project version for NMCP plugin
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ android.useAndroidX=true
kotlin.code.style=official
android.nonTransitiveRClass=true

compileSdk=35
compileSdk=37
minSdk=26
javaVersion=17
jvmTarget=17

libraryVersion=1.3.1
libraryVersion=1.4.0
android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
17 changes: 10 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
[versions]
composeLibs = "1.7.8"
agp = "9.2.1"
kotlin = "2.0.21"
composeLibs = "1.12.1"
# material3 は compose-ui とは別のバージョン系列。composeLibs(ui 系)を流用すると
# 存在しない material3:1.7.8 を要求してクラスパスごと解決に失敗する。
material3 = "1.4.0"
agp = "9.4.1"
kotlin = "2.4.20"

composeBom = "2025.02.00"
lifecycleRuntimeKtx = "2.8.7"
composeBom = "2026.09.00"
lifecycleRuntimeKtx = "2.11.0"
longdoSdk = "1.3.0"
activityCompose = "1.9.3"
activityCompose = "1.13.0"
ktLint = "14.2.0"
junit = "4.13.2"
junitVersion = "1.3.0"
Expand All @@ -28,7 +31,7 @@ longdo-sdk = { module = "com.longdo.map:sdk3", version.ref = "longdoSdk" }

# Sample app
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "composeLibs" }
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "composeLibs" }

# Test
Expand Down
Loading
Loading