From f6155cc6a59268dd1dd593f27c3763d85f4b6a5d Mon Sep 17 00:00:00 2001
From: jasonczc <jasonczc@qq.com>
Date: Thu, 13 Feb 2020 21:11:00 +0800
Subject: [PATCH] Fix gradle build
---
build.gradle | 20 +++++++++++---------
gradle/wrapper/gradle-wrapper.properties | 2 +-
mirai-console/build.gradle.kts | 3 ++-
mirai-plugins/image-sender/build.gradle.kts | 2 +-
settings.gradle | 2 +-
5 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/build.gradle b/build.gradle
index 08d1243f2..de1d115e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,20 +11,22 @@ buildscript {
// Do try to waste your time.
classpath 'com.android.tools.build:gradle:3.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+ classpath("com.github.jengelman.gradle.plugins:shadow:5.2.0")
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicFuVersion"
}
}
-def keyProps = new Properties()
-def keyFile = file("local.properties")
-if (keyFile.exists()) keyFile.withInputStream { keyProps.load(it) }
-if (!keyProps.getProperty("sdk.dir", "").isEmpty()) {
- project.ext.set("isAndroidSDKAvailable", true)
-} else {
- project.ext.set("isAndroidSDKAvailable", false)
-}
-
+try {
+ def keyProps = new Properties()
+ def keyFile = file("local.properties")
+ if (keyFile.exists()) keyFile.withInputStream { keyProps.load(it) }
+ if (!keyProps.getProperty("sdk.dir", "").isEmpty()) {
+ project.ext.set("isAndroidSDKAvailable", true)
+ } else {
+ project.ext.set("isAndroidSDKAvailable", false)
+ }
+}catch(Exception e){}
allprojects {
group = "net.mamoe"
version = getProperty("mirai_version")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3dbe6db2a..28f135b7f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
#Thu Feb 06 14:10:33 CST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
diff --git a/mirai-console/build.gradle.kts b/mirai-console/build.gradle.kts
index 9793ad677..a9fb86dcd 100644
--- a/mirai-console/build.gradle.kts
+++ b/mirai-console/build.gradle.kts
@@ -1,10 +1,11 @@
plugins {
- id("com.github.johnrengelman.shadow") version "5.2.0"
id("kotlinx-serialization")
id("kotlin")
id("java")
}
+apply(plugin="com.github.johnrengelman.shadow")
+
val kotlinVersion: String by rootProject.ext
val atomicFuVersion: String by rootProject.ext
val coroutinesVersion: String by rootProject.ext
diff --git a/mirai-plugins/image-sender/build.gradle.kts b/mirai-plugins/image-sender/build.gradle.kts
index e519033a2..c2c3174a9 100644
--- a/mirai-plugins/image-sender/build.gradle.kts
+++ b/mirai-plugins/image-sender/build.gradle.kts
@@ -1,7 +1,7 @@
plugins {
kotlin("jvm")
java
- id("com.github.johnrengelman.shadow") version "5.2.0"
+ id("com.github.johnrengelman.shadow")
}
version = "1.0.0"
diff --git a/settings.gradle b/settings.gradle
index ce530da22..c94d586a7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -59,7 +59,7 @@ if (versionPos==-1){
def javaVersionNum = javaVersion.substring(0, versionPos).toInteger()
if (javaVersionNum >= 11) {
println("jdk版本为 "+ javaVersionNum)
- include(':mirai-debug')
+ //include(':mirai-debug')
} else {
println("当前使用的 JDK 版本为 ${System.getProperty("java.version")}, 最低需要 JDK 11 才能引入模块 `:mirai-debug`")
}