Skip to content

Commit 89eab28

Browse files
iTaysonLabiTaysonLab
committed
update libraries, remove deprecated symbols, fix deeplinks
1 parent 7dd0fa6 commit 89eab28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+464
-3705
lines changed

‎.idea/AndroidProjectSystem.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/compiler.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/deploymentTargetSelector.xml‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/inspectionProfiles/Project_Default.xml‎

Lines changed: 62 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/migrations.xml‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml‎

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.kotlin/errors/errors-1748751419779.log‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
kotlin version: 2.1.21
2+
error message: java.lang.IncompatibleClassChangeError: class dev.zacsweers.moshix.ir.compiler.api.MoshiOrigin cannot inherit from final class org.jetbrains.kotlin.ir.declarations.IrDeclarationOriginImpl
3+
at java.base/java.lang.ClassLoader.defineClass1(Native Method)
4+
at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1017)
5+
at java.base/java.security.SecureClassLoader.defineClass(SecureClassLoader.java:150)
6+
at java.base/java.net.URLClassLoader.defineClass(URLClassLoader.java:524)
7+
at java.base/java.net.URLClassLoader$1.run(URLClassLoader.java:427)
8+
at java.base/java.net.URLClassLoader$1.run(URLClassLoader.java:421)
9+
at java.base/java.security.AccessController.doPrivileged(AccessController.java:712)
10+
at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:420)
11+
at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:592)
12+
at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:525)
13+
at dev.zacsweers.moshix.ir.compiler.api.MoshiAdapterGenerator.generateType(MoshiAdapterGenerator.kt:160)
14+
at dev.zacsweers.moshix.ir.compiler.api.MoshiAdapterGenerator.prepare(MoshiAdapterGenerator.kt:148)
15+
at dev.zacsweers.moshix.ir.compiler.MoshiIrVisitor.visitClassNew(MoshiIrVisitor.kt:136)
16+
at org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext.visitClass(IrElementTransformerVoidWithContext.kt:62)
17+
at org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid.visitClass(IrElementTransformerVoid.kt:57)
18+
at org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid.visitClass(IrElementTransformerVoid.kt:19)
19+
at org.jetbrains.kotlin.ir.declarations.IrClass.accept(IrClass.kt:72)
20+
at org.jetbrains.kotlin.ir.IrElementBase.transform(IrElementBase.kt:34)
21+
at org.jetbrains.kotlin.ir.util.TransformKt.transformInPlace(transform.kt:35)
22+
at org.jetbrains.kotlin.ir.declarations.IrFile.transformChildren(IrFile.kt:38)
23+
at org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid.visitPackageFragment(IrElementTransformerVoid.kt:152)
24+
at org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid.visitFile(IrElementTransformerVoid.kt:166)
25+
at org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext.visitFileNew(IrElementTransformerVoidWithContext.kt:122)
26+
at org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext.visitFile(IrElementTransformerVoidWithContext.kt:55)
27+
at org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid.visitFile(IrElementTransformerVoid.kt:169)
28+
at org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid.visitFile(IrElementTransformerVoid.kt:19)
29+
at org.jetbrains.kotlin.ir.declarations.IrFile.accept(IrFile.kt:28)
30+
at org.jetbrains.kotlin.ir.declarations.IrFile.transform(IrFile.kt:31)
31+
at org.jetbrains.kotlin.ir.declarations.IrFile.transform(IrFile.kt:20)
32+
at org.jetbrains.kotlin.ir.util.TransformKt.transformInPlace(transform.kt:35)
33+
at org.jetbrains.kotlin.ir.declarations.IrModuleFragment.transformChildren(IrModuleFragment.kt:40)
34+
at org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid.visitModuleFragment(IrElementTransformerVoid.kt:108)
35+
at org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid.visitModuleFragment(IrElementTransformerVoid.kt:113)
36+
at org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid.visitModuleFragment(IrElementTransformerVoid.kt:19)
37+
at org.jetbrains.kotlin.ir.declarations.IrModuleFragment.accept(IrModuleFragment.kt:30)
38+
at org.jetbrains.kotlin.ir.declarations.IrModuleFragment.transform(IrModuleFragment.kt:33)
39+
at dev.zacsweers.moshix.ir.compiler.MoshiIrGenerationExtension.generate(MoshiIrGenerationExtension.kt:53)
40+
at org.jetbrains.kotlin.fir.pipeline.ConvertToIrKt.applyIrGenerationExtensions(convertToIr.kt:472)
41+
at org.jetbrains.kotlin.fir.pipeline.Fir2IrPipeline.runActualizationPipeline(convertToIr.kt:241)
42+
at org.jetbrains.kotlin.fir.pipeline.Fir2IrPipeline.convertToIrAndActualize(convertToIr.kt:130)
43+
at org.jetbrains.kotlin.fir.pipeline.ConvertToIrKt.convertToIrAndActualize(convertToIr.kt:100)
44+
at org.jetbrains.kotlin.fir.pipeline.ConvertToIrKt.convertToIrAndActualize$default(convertToIr.kt:75)
45+
at org.jetbrains.kotlin.cli.jvm.compiler.legacy.pipeline.JvmCompilerPipelineKt.convertToIrAndActualizeForJvm(jvmCompilerPipeline.kt:108)
46+
at org.jetbrains.kotlin.cli.pipeline.jvm.JvmFir2IrPipelinePhase.executePhase(JvmFir2IrPipelinePhase.kt:26)
47+
at org.jetbrains.kotlin.cli.pipeline.jvm.JvmFir2IrPipelinePhase.executePhase(JvmFir2IrPipelinePhase.kt:17)
48+
at org.jetbrains.kotlin.cli.pipeline.PipelinePhase.phaseBody(PipelinePhase.kt:68)
49+
at org.jetbrains.kotlin.cli.pipeline.PipelinePhase.phaseBody(PipelinePhase.kt:58)
50+
at org.jetbrains.kotlin.config.phaser.SimpleNamedCompilerPhase.phaseBody(CompilerPhase.kt:215)
51+
at org.jetbrains.kotlin.config.phaser.NamedCompilerPhase.invoke(CompilerPhase.kt:111)
52+
at org.jetbrains.kotlin.backend.common.phaser.CompositePhase.invoke(PhaseBuilders.kt:28)
53+
at org.jetbrains.kotlin.config.phaser.CompilerPhaseKt.invokeToplevel(CompilerPhase.kt:62)
54+
at org.jetbrains.kotlin.cli.pipeline.AbstractCliPipeline.runPhasedPipeline(AbstractCliPipeline.kt:106)
55+
at org.jetbrains.kotlin.cli.pipeline.AbstractCliPipeline.execute(AbstractCliPipeline.kt:65)
56+
at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecutePhased(K2JVMCompiler.kt:61)
57+
at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecutePhased(K2JVMCompiler.kt:36)
58+
at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.kt:80)
59+
at org.jetbrains.kotlin.cli.common.CLICompiler.exec(CLICompiler.kt:337)
60+
at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.runCompiler(IncrementalJvmCompilerRunner.kt:466)
61+
at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.runCompiler(IncrementalJvmCompilerRunner.kt:75)
62+
at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.doCompile(IncrementalCompilerRunner.kt:514)
63+
at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileImpl(IncrementalCompilerRunner.kt:431)
64+
at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileNonIncrementally(IncrementalCompilerRunner.kt:310)
65+
at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compile(IncrementalCompilerRunner.kt:137)
66+
at org.jetbrains.kotlin.daemon.CompileServiceImplBase.execIncrementalCompiler(CompileServiceImpl.kt:678)
67+
at org.jetbrains.kotlin.daemon.CompileServiceImplBase.access$execIncrementalCompiler(CompileServiceImpl.kt:92)
68+
at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1805)
69+
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
70+
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
71+
at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
72+
at java.base/java.lang.reflect.Method.invoke(Method.java:568)
73+
at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:360)
74+
at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200)
75+
at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197)
76+
at java.base/java.security.AccessController.doPrivileged(AccessController.java:712)
77+
at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196)
78+
at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:587)
79+
at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:828)
80+
at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:705)
81+
at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
82+
at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:704)
83+
at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
84+
at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
85+
at java.base/java.lang.Thread.run(Thread.java:840)
86+
87+

‎app/build.gradle‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ plugins {
22
id 'com.android.application'
33
id 'kotlin-android'
44
id 'kotlin-kapt'
5+
id 'org.jetbrains.kotlin.plugin.compose'
6+
id 'org.jetbrains.kotlin.plugin.serialization'
57
id 'com.google.devtools.ksp' version "$ksp_version"
68
id 'dev.zacsweers.moshix' version "$moshix_version"
79
id 'dagger.hilt.android.plugin'
@@ -16,12 +18,12 @@ kapt {
1618
}
1719

1820
android {
19-
compileSdk 32
21+
compileSdk 36
2022

2123
defaultConfig {
2224
applicationId "bruhcollective.itaysonlab.jetibox"
23-
minSdk 21
24-
targetSdk 32
25+
minSdk 23
26+
targetSdk 36
2527
versionCode 1
2628
versionName "1.0"
2729

@@ -52,47 +54,47 @@ android {
5254
compose true
5355
}
5456

55-
composeOptions {
56-
kotlinCompilerExtensionVersion compose_compiler_version
57-
}
58-
5957
packagingOptions {
6058
resources {
6159
excludes += '/META-INF/{AL2.0,LGPL2.1}'
60+
excludes += "META-INF/versions/9/OSGI-INF/MANIFEST.MF"
6261
}
6362
}
63+
64+
namespace 'bruhcollective.itaysonlab.jetibox'
6465
}
6566

6667
dependencies {
6768
// Submodules
6869
implementation project(":xal")
6970

7071
// Kotlin
71-
implementation "org.jetbrains.kotlinx:kotlinx-datetime:0.4.0"
72+
implementation "org.jetbrains.kotlinx:kotlinx-datetime:0.6.2"
7273

7374
// AndroidX
74-
implementation "androidx.core:core-ktx:1.8.0"
75-
implementation "androidx.webkit:webkit:1.4.0"
76-
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.0"
77-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
75+
implementation "androidx.core:core-ktx:1.16.0"
76+
implementation "androidx.webkit:webkit:1.13.0"
77+
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.9.0"
78+
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0"
7879

7980
// AndroidX - Compose
80-
implementation "androidx.compose.material:material-icons-extended:1.1.1"
81+
implementation "androidx.compose.material:material-icons-extended:1.7.8"
8182
implementation "androidx.compose.ui:ui:$compose_version"
82-
implementation "androidx.compose.material3:material3:1.0.0-alpha14"
83+
implementation "androidx.compose.material3:material3:1.3.2"
8384
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
84-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0"
85-
implementation "androidx.activity:activity-compose:1.5.0"
85+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0"
86+
implementation "androidx.activity:activity-compose:1.10.1"
8687
implementation "androidx.navigation:navigation-compose:$nav_version"
87-
implementation "androidx.hilt:hilt-navigation-compose:1.0.0"
88+
implementation "androidx.hilt:hilt-navigation-compose:1.2.0"
8889
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
8990
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
91+
implementation "com.materialkolor:material-kolor:3.0.0-beta05"
9092

9193
// Room and other DB
92-
implementation "com.tencent:mmkv:1.2.13"
94+
implementation "com.tencent:mmkv:2.2.2"
9395
implementation "androidx.room:room-runtime:$room_version"
9496
implementation "androidx.room:room-ktx:$room_version"
95-
implementation "androidx.room:room-paging:2.5.0-alpha02"
97+
implementation "androidx.room:room-paging:2.7.1"
9698
ksp "androidx.room:room-compiler:$room_version"
9799

98100
implementation "com.google.accompanist:accompanist-navigation-material:$accompanist_version"
@@ -114,7 +116,7 @@ dependencies {
114116
kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
115117

116118
// Utils
117-
implementation 'com.markodevcic:peko:2.2.0'
119+
implementation 'com.markodevcic:peko:3.0.5'
118120

119121
// Tests
120122
testImplementation "junit:junit:4.13.2"

0 commit comments

Comments
 (0)