feat(git): two-way git sync with in-app conflict resolution#63

Merged

tstapler merged 18 commits intomainfrom

stelekit-git-integration

May 3, 2026

Commits on May 2, 2026

feat(git): add two-way git sync with conflict resolution UI

tstapler
and
claude
committed
build: upgrade to Gradle 9.5.0 + Kotlin 2.3.21 for Java 25 support

tstapler
and
claude
committed

Commits on May 3, 2026

fix(ci): resolve detekt JVM 25 rejection and Android jsch duplicate classes

tstapler
and
claude
committed
fix(ci): resolve Wasm, Android desugaring, and detekt issues

tstapler
and
claude
committed
fix: add wasmJs actuals and cap Android Kotlin JVM target to 21

tstapler
and
claude
committed
fix: revert Kotlin 2.3.21→2.3.10 and jvmToolchain 25→21 for R8 compatibility

tstapler
and
claude
committed
fix: restore jvmToolchain(25) for local Java 25 desktop run with Android capped at JVM_21

tstapler
and
claude
committed
fix: revert jvmToolchain to 21 — JDK 25 toolchain breaks R8 8.9.32 metadata parsing

tstapler
and
claude
committed
fix: upgrade AGP 8.9.1→8.13.2, re-upgrade Kotlin 2.3.10→2.3.21, restore jvmToolchain(25)

tstapler
and
claude
committed
fix: re-throw CancellationException in git catch blocks; exclude plugin.properties

tstapler
and
claude
committed
fix: upgrade Robolectric 4.13→4.16 and pin test SDK to 34 for AGP 8.13.2 compatibility

tstapler
and
claude
committed
fix(git): address review comment bugs in sync and UI components

tstapler
and
claude
committed
fix(git): implement all deferred review items

tstapler
and
claude
committed
fix(ci): resolve compileCommonMainKotlinMetadata failures in editor files

tstapler
and
claude
committed
fix(ci): disable classpath snapshots for iOS metadata compilation

tstapler
and
claude
committed
fix(ci): replace compileCommonMainKotlinMetadata with compileKotlinJvm

tstapler
and
claude
committed
fix(editor): remove call to non-existent getFormatAt method

tstapler
and
claude
committed
fix(git): store HTTPS token in CredentialStore before test connection

tstapler
and
claude
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(git): two-way git sync with in-app conflict resolution#63

feat(git): two-way git sync with in-app conflict resolution#63
tstapler merged 18 commits intomainfrom
stelekit-git-integration

Commits on May 2, 2026

feat(git): add two-way git sync with conflict resolution UI

build: upgrade to Gradle 9.5.0 + Kotlin 2.3.21 for Java 25 support

Commits on May 3, 2026

fix(ci): resolve detekt JVM 25 rejection and Android jsch duplicate classes

fix(ci): resolve Wasm, Android desugaring, and detekt issues

fix: add wasmJs actuals and cap Android Kotlin JVM target to 21

fix: revert Kotlin 2.3.21→2.3.10 and jvmToolchain 25→21 for R8 compatibility

fix: restore jvmToolchain(25) for local Java 25 desktop run with Android capped at JVM_21

fix: revert jvmToolchain to 21 — JDK 25 toolchain breaks R8 8.9.32 metadata parsing

fix: upgrade AGP 8.9.1→8.13.2, re-upgrade Kotlin 2.3.10→2.3.21, restore jvmToolchain(25)

fix: re-throw CancellationException in git catch blocks; exclude plugin.properties

fix: upgrade Robolectric 4.13→4.16 and pin test SDK to 34 for AGP 8.13.2 compatibility

fix(git): address review comment bugs in sync and UI components

fix(git): implement all deferred review items

fix(ci): resolve compileCommonMainKotlinMetadata failures in editor files

fix(ci): disable classpath snapshots for iOS metadata compilation

fix(ci): replace compileCommonMainKotlinMetadata with compileKotlinJvm

fix(editor): remove call to non-existent getFormatAt method

fix(git): store HTTPS token in CredentialStore before test connection