github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-14 15:20:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies for mirai-debug

Browse Source
This commit is contained in:
Him188 2019-11-08 20:51:40 +08:00
parent 3eca212bf6
commit f3278c8afe
8 changed files with 59 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mirai-console/build.gradle
View File

@ -2,6 +2,7 @@ apply plugin: "kotlin"
apply plugin: "java"
dependencies {
api project(":mirai-core")
runtime files("../../mirai-core/build/classes/kotlin/jvm/main") // mpp targeting android limitation
api project(':mirai-core')
implementation files('../../mirai-core/build/classes/kotlin/jvm/main')
// mpp targeting android limitation
}

7
mirai-core/build.gradle.kts
View File

@ -66,7 +66,8 @@ kotlin {
sourceSets["androidMain"].apply {
dependencies {
dependsOn(commonMain)
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
api("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
@ -79,12 +80,14 @@ kotlin {
sourceSets["jvmMain"].apply {
dependencies {
dependsOn(commonMain)
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7")
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
api("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
implementation("io.ktor:ktor-client-core-jvm:$ktorVersion")
implementation("org.jetbrains.kotlinx:kotlinx-io-jvm:$kotlinXIoVersion")
}
}

36
mirai-debug/build.gradle
View File

@ -1,36 +0,0 @@
plugins {
id 'application'
id 'org.openjfx.javafxplugin' version '0.0.8'
}
apply plugin: "kotlin"
apply plugin: "java"
javafx {
version = "11"
modules = [ 'javafx.controls' ]
}
dependencies {
implementation project(':mirai-core')
implementation files('./lib/jpcap.jar')
api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version
api group: 'org.jetbrains.kotlinx', name: 'kotlinx-io', version: kotlinxio_version
api group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_version
// https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-javafx
compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-javafx', version: '1.3.2'
implementation 'org.pcap4j:pcap4j-distribution:1.8.2'
implementation 'no.tornado:tornadofx:1.7.17'
}
mainClassName = 'Application'
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}

49
mirai-debug/build.gradle.kts Normal file
View File

@ -0,0 +1,49 @@
plugins {
id("application")
id("org.openjfx.javafxplugin") version "0.0.8"
kotlin("jvm")
java
}
javafx {
version = "11"
modules = listOf("javafx.controls")
//mainClassName = "Application"
}
val kotlinVersion = rootProject.ext["kotlin_version"].toString()
val atomicFuVersion = rootProject.ext["atomicfu_version"].toString()
val coroutinesVersion = rootProject.ext["coroutines_version"].toString()
val kotlinXIoVersion = rootProject.ext["kotlinxio_version"].toString()
val coroutinesIoVersion = rootProject.ext["coroutinesio_version"].toString()
val klockVersion = rootProject.ext["klock_version"].toString()
val ktorVersion = rootProject.ext["ktor_version"].toString()
kotlin {
sourceSets {
all {
languageSettings.enableLanguageFeature("InlineClasses")
}
}
}
dependencies {
api(project(":mirai-core"))
runtimeOnly(files("../../mirai-core/build/classes/kotlin/jvm/main")) // mpp targeting android limitation
api("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
implementation("org.pcap4j:pcap4j-distribution:1.8.2")
implementation("no.tornado:tornadofx:1.7.17")
compile(group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-javafx", version = "1.3.2")
implementation(files("./lib/jpcap.jar"))
implementation("org.jetbrains.kotlin:kotlin-stdlib")
implementation("org.jetbrains.kotlinx:atomicfu:$atomicFuVersion")
implementation("org.jetbrains.kotlinx:kotlinx-io-jvm:$kotlinXIoVersion")
implementation("org.jetbrains.kotlinx:kotlinx-io:$kotlinXIoVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-io:$coroutinesIoVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
}

0
mirai-debug/src/main/java/DecryptTest.kt → mirai-debug/src/main/kotlin/DecryptTest.kt
View File

0
mirai-debug/src/main/java/HexDebuggerGui.kt → mirai-debug/src/main/kotlin/HexDebuggerGui.kt
View File

1
mirai-debug/src/main/java/PacketDebuger.kt → mirai-debug/src/main/kotlin/PacketDebuger.kt
View File

@ -6,6 +6,7 @@ import Main.localIp
import Main.qq
import Main.sessionKey
import kotlinx.coroutines.*
import kotlinx.coroutines.io.packet.ByteReadPacket
import kotlinx.io.core.discardExact
import kotlinx.io.core.readBytes
import kotlinx.io.core.readUInt

2
settings.gradle
View File

@ -8,7 +8,7 @@ include(':mirai-demos:mirai-demo-1')
include(':mirai-demos:mirai-demo-gentleman')
include(':mirai-demos')
include(':mirai-demos:mirai-demo-android')
//include(':mirai-debug')
include(':mirai-debug')
project(':mirai-demos:mirai-demo-1').projectDir = file('mirai-demos/mirai-demo-1')
project(':mirai-demos:mirai-demo-gentleman').projectDir = file('mirai-demos/mirai-demo-gentleman')
project(':mirai-demos:mirai-demo-android').projectDir = file('mirai-demos/mirai-demo-android')