Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
bda54781
Commit
bda54781
authored
Nov 15, 2019
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust build.gradle
parent
7adacdbc
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
67 additions
and
9 deletions
+67
-9
.gitignore
.gitignore
+4
-1
build.gradle
build.gradle
+4
-2
mirai-core/build.gradle.backup
mirai-core/build.gradle.backup
+1
-1
mirai-core/build.gradle.kts
mirai-core/build.gradle.kts
+51
-3
mirai-demos/mirai-demo-android/build.gradle
mirai-demos/mirai-demo-android/build.gradle
+1
-1
mirai-demos/mirai-demo-gentleman/build.gradle
mirai-demos/mirai-demo-gentleman/build.gradle
+6
-1
No files found.
.gitignore
View file @
bda54781
...
...
@@ -37,4 +37,7 @@ mirai.iml
.gradle/
local.properties
\ No newline at end of file
local.properties
# Maven publishing credits
mirai-core/credits.properties
\ No newline at end of file
build.gradle
View file @
bda54781
...
...
@@ -2,10 +2,10 @@ buildscript {
ext
.
kotlin_version
=
'1.3.50'
repositories
{
maven
{
url
"https://mirrors.huaweicloud.com/repository/maven/"
}
mavenLocal
()
jcenter
()
google
()
maven
{
url
"https://mirrors.huaweicloud.com/repository/maven/"
}
}
dependencies
{
...
...
@@ -20,9 +20,11 @@ allprojects {
version
=
getProperty
(
"mirai_version"
)
repositories
{
maven
{
url
"https://mirrors.huaweicloud.com/repository/maven/"
}
mavenLocal
()
jcenter
()
google
()
maven
{
url
"https://mirrors.huaweicloud.com/repository/maven/"
}
maven
{
url
"https://dl.bintray.com/kotlin/kotlin-eap"
}
maven
{
url
"https://dl.bintray.com/kotlin/kotlin-dev"
}
}
}
mirai-core/build.gradle.backup
View file @
bda54781
...
...
@@ -13,7 +13,7 @@ kotlin {
binaries {
executable {
// Change to specify fully qualified name of your application's entry point:
entryPoint = 'main'
entryPoint = '
hex.
main'
// Specify command-line arguments, if necessary:
runTask?.args('')
}
...
...
mirai-core/build.gradle.kts
View file @
bda54781
@
file
:
Suppress
(
"UNUSED_VARIABLE"
)
import
com.android.build.gradle.api.AndroidSourceSet
plugins
{
id
(
"kotlinx-atomicfu"
)
kotlin
(
"multiplatform"
)
id
(
"com.android.library"
)
`maven-publish`
//id("kotlin-android-extensions")
}
group
=
"net.mamoe.mirai"
version
=
"0.1.0"
description
=
"Mirai core"
val
kotlinVersion
=
rootProject
.
ext
[
"kotlin_version"
].
toString
()
val
atomicFuVersion
=
rootProject
.
ext
[
"atomicfu_version"
].
toString
()
val
coroutinesVersion
=
rootProject
.
ext
[
"coroutines_version"
].
toString
()
...
...
@@ -19,7 +27,7 @@ val ktorVersion = rootProject.ext["ktor_version"].toString()
kotlin
{
android
(
"android"
)
{
project
.
plugins
.
apply
(
"com.android.library"
)
publishLibraryVariants
(
"release"
,
"debug"
)
project
.
android
{
compileSdkVersion
(
29
)
buildToolsVersion
(
"29.0.2"
)
...
...
@@ -46,18 +54,24 @@ kotlin {
(
sourceSets
[
"main"
]
as
AndroidSourceSet
).
java
.
srcDirs
(
file
(
"src/androidMain/kotlin"
))
}
}
jvm
(
"jvm"
)
jvm
(
"jvm"
)
{
// withJava()
}
val
commonMain
=
sourceSets
[
"commonMain"
].
apply
{
dependencies
{
api
(
"org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
)
kotlin
(
"kotlin-reflect"
,
kotlinVersion
)
//api("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
implementation
(
"com.soywiz.korlibs.klock:klock:$klockVersion"
)
implementation
(
"org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$coroutinesVersion"
)
implementation
(
"io.ktor:ktor-http-cio:$ktorVersion"
)
implementation
(
"io.ktor:ktor-http:$ktorVersion"
)
implementation
(
"io.ktor:ktor-client-core-jvm:$ktorVersion"
)
implementation
(
"io.ktor:ktor-client-cio:$ktorVersion"
)
//implementation("io.ktor:ktor-io:1.3.0-beta-1")
implementation
(
"io.ktor:ktor-client-core:$ktorVersion"
)
implementation
(
"io.ktor:ktor-network:$ktorVersion"
)
}
...
...
@@ -111,4 +125,38 @@ kotlin {
implementation
(
"org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
)
}
}
sourceSets
{
getByName
(
"commonMain"
)
{
dependencies
{
implementation
(
kotlin
(
"reflect"
))
}
}
}
}
publishing
{
publications
.
withType
<
MavenPublication
>().
apply
{
val
jvm
by
getting
{}
val
metadata
by
getting
{
}
}
}
/*
publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/mamoe/mirai")
credentials {
val local = loadProperties("local.properties")
username = local["miraiCorePublicationUsername"]?.toString()?:error("Cannot find miraiCorePublicationUsername")
password = local["miraiCorePublicationKey"].toString()?:error("Cannot find miraiCorePublicationKey")
}
}
}
}
fun loadProperties(filename: String): Properties = Properties().apply { load(DataInputStream(rootProject.file(filename).inputStream())) }
*/
\ No newline at end of file
mirai-demos/mirai-demo-android/build.gradle
View file @
bda54781
...
...
@@ -41,7 +41,7 @@ dependencies {
implementation
"org.jetbrains.kotlin:kotlin-stdlib"
implementation
project
(
':mirai-core'
)
implementation
group:
'org.jetbrains.kotlin'
,
name:
'kotlin-stdlib-jdk8'
,
version:
kotlin_version
api
group:
'org.jetbrains.kotlin'
,
name:
'kotlin-stdlib-jdk8'
,
version:
kotlin_version
implementation
group:
'org.jetbrains.kotlinx'
,
name:
'kotlinx-coroutines-core'
,
version:
coroutines_version
implementation
group:
'org.jetbrains.kotlinx'
,
name:
'kotlinx-coroutines-android'
,
version:
"1.3.2"
...
...
mirai-demos/mirai-demo-gentleman/build.gradle
View file @
bda54781
...
...
@@ -13,4 +13,9 @@ dependencies {
implementation
'org.jsoup:jsoup:1.12.1'
}
mainClassName
=
"demo.gentleman.MainKt"
\ No newline at end of file
mainClassName
=
"demo.gentleman.MainKt"
compileKotlin
{
kotlinOptions
{
freeCompilerArgs
=
[
"-XXLanguage:+InlineClasses"
]
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment