Skip to content

Commit 98f23ff

Browse files
committed
build.gradle improved.
`gradle.properties` properties sorted. Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>
1 parent 5a2c443 commit 98f23ff

File tree

2 files changed

+56
-50
lines changed

2 files changed

+56
-50
lines changed

build.gradle

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
11
buildscript {
22
repositories {
33
maven { url "https://files.minecraftforge.net/maven" }
4-
maven { url "https://libraries.minecraft.net" }
5-
maven { url "https://plugins.gradle.org/m2/" }
6-
jcenter()
7-
mavenCentral()
84
}
95
dependencies {
10-
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: forge_gradle_version, changing: true
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
12-
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
13-
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
6+
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
147
}
158
}
169

1710
plugins {
18-
id "maven-publish"
19-
id "java-library"
20-
id "maven"
11+
id 'org.jetbrains.kotlin.jvm' version '1.3.70'
12+
id 'org.jetbrains.kotlin.plugin.serialization' version '1.3.70'
13+
id 'org.jetbrains.dokka' version '0.10.1'
14+
id 'maven-publish'
15+
id 'java-library'
2116
}
2217

23-
apply plugin: "org.jetbrains.dokka"
24-
apply plugin: "net.minecraftforge.gradle"
25-
apply plugin: "kotlin"
26-
apply plugin: "kotlinx-serialization"
18+
apply plugin: 'net.minecraftforge.gradle'
19+
20+
String packagesToken = new String(
21+
package_public_token.decodeBase64()
22+
)
2723

2824
version = module_version as Object
2925
group = "com.mairwunnx.$module_id"
@@ -40,14 +36,14 @@ minecraft {
4036

4137
runs {
4238
client {
43-
property "forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP"
44-
property "forge.logging.console.level", "debug"
39+
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
40+
property 'forge.logging.console.level', 'debug'
4541
mods { ProjectEssentialsCore { source sourceSets.main } }
4642
workingDirectory project.file(dev_run_client_path as Object)
4743
}
4844
server {
49-
property "forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP"
50-
property "forge.logging.console.level", "debug"
45+
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
46+
property 'forge.logging.console.level', 'debug'
5147
mods { ProjectEssentialsCore { source sourceSets.main } }
5248
workingDirectory project.file(dev_run_server_path as Object)
5349
}
@@ -56,33 +52,34 @@ minecraft {
5652

5753
repositories {
5854
maven {
59-
name = "GitHubPackages"
60-
url = uri "https://maven.pkg.github.com/projectessentials/projectessentials-permissions"
55+
name = package_maven_repo_name
56+
url = uri "$package_maven_repo-permissions"
6157
credentials {
62-
username = "MairwunNx@gmail.com"
63-
password = package_public_token
58+
username = package_maven_repo_mail
59+
password = packagesToken
6460
}
6561
}
6662
maven {
67-
name = "GitHubPackages"
68-
url = uri "https://maven.pkg.github.com/projectessentials/projectessentials-cooldown"
63+
name = package_maven_repo_name
64+
url = uri "$package_maven_repo-cooldown"
6965
credentials {
70-
username = "MairwunNx@gmail.com"
71-
password = package_public_token
66+
username = package_maven_repo_mail
67+
password = packagesToken
7268
}
7369
}
74-
75-
jcenter()
70+
maven { url 'https://libraries.minecraft.net' }
71+
maven { url 'https://jitpack.io' }
7672
mavenCentral()
77-
maven { url "https://libraries.minecraft.net" }
78-
maven { url("https://jitpack.io") }
73+
jcenter()
7974
}
8075

8176
dependencies {
8277
minecraft "net.minecraftforge:forge:$forge_version"
8378
implementation "com.mojang:brigadier:$brigadier_version"
84-
implementation "com.mairwunnx.project_essentials_permissions:ProjectEssentials-Permissions:1.15.2-1.0.1"
85-
implementation "com.mairwunnx.project_essentials_cooldown:ProjectEssentials-Cooldown:1.15.2-1.0.1"
79+
80+
implementation "com.mairwunnx.project_essentials_permissions:ProjectEssentials-Permissions:$permissions_version"
81+
implementation "com.mairwunnx.project_essentials_cooldown:ProjectEssentials-Cooldown:$cooldown_version"
82+
8683
internal "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlinx_serialization_version"
8784
internal "org.jetbrains.kotlin:kotlin-stdlib-$kotlin_jdk_version_target:$kotlin_version"
8885
internal "org.json:json:$json_version"
@@ -140,8 +137,8 @@ reobf {
140137
}
141138
}
142139

143-
project.tasks["jar"].dependsOn project.tasks["dokka"]
144-
project.tasks["modJar"].dependsOn project.tasks["jar"]
140+
project.tasks['jar'].dependsOn project.tasks['dokka']
141+
project.tasks['modJar'].dependsOn project.tasks['jar']
145142

146143
sourceCompatibility = targetCompatibility =
147144
compileJava.sourceCompatibility =
@@ -152,19 +149,19 @@ compileKotlin.kotlinOptions.jvmTarget =
152149

153150
task dokkaJar(type: Jar) {
154151
group = JavaBasePlugin.DOCUMENTATION_GROUP
155-
description = "Assembles Kotlin docs with Dokka"
156-
classifier = "javadoc"
152+
description = 'Assembles Kotlin docs with Dokka'
153+
classifier = 'javadoc'
157154
from tasks.dokka as Object
158155
}
159156

160157
publishing {
161158
repositories {
162159
maven {
163-
name = "GitHubPackages"
164-
url = uri "https://maven.pkg.github.com/projectessentials/projectessentials-core"
160+
name = 'GitHubPackages'
161+
url = uri 'https://maven.pkg.github.com/projectessentials/projectessentials-core'
165162
credentials {
166-
username = System.getenv("GradleUser")
167-
password = System.getenv("GradlePass")
163+
username = System.getenv('GradleUser')
164+
password = System.getenv('GradlePass')
168165
}
169166
}
170167
}

gradle.properties

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,34 @@
1+
# Gradle settings.
12
org.gradle.jvmargs=-Xmx3G
23
org.gradle.daemon=false
34
org.gradle.caching=true
4-
kotlin.code.style=official
5+
# Run directories paths for debugging.
56
dev_run_client_path=run-client
67
dev_run_server_path=run-server
7-
forge_gradle_version=3.+
8-
forge_version=1.15.2-31.1.1
8+
# Forge mappings channel type and version.
99
forge_mappings_channel_type=snapshot
1010
forge_mappings_channel_version=20190719-1.14.3
11+
# Forge dependencies.
12+
forge_version=1.15.2-31.1.0
1113
brigadier_version=1.0.17
14+
# Project compatibility settings.
1215
kotlin_jdk_version_target=jdk8
1316
project_jvm_version_target=1.8
17+
kotlin.code.style=official
18+
# Project external dependencies.
1419
kotlin_version=1.3.70
1520
kotlinx_serialization_version=0.20.0
16-
dokka_version=0.10.1
17-
gson_version=2.8.6
1821
json_version=20190722
19-
permissions_version=v1.15.2-1.0.0
20-
cooldown_version=v1.15.2-1.0.0
21-
module_version=1.15.2-1.1.0
22+
# Module informatation.
23+
module_version=1.14.4-1.3.0
2224
module_name=Project Essentials Core
2325
module_id=project_essentials_core
2426
module_vendor=MairwunNx (Pavel Erokhin)
25-
package_public_token=4096fd4ac93bbc65b17d1d9abbd1d84280bef2ce
27+
# Public packages information for getting other dependencies.
28+
package_public_token=ZDhjMjgyNjlhM2E0ZTQ0MmM2Mjk5ZWI4YmMyZjI0YzNjOTNkMDVkZA==
29+
package_maven_repo=https://maven.pkg.github.com/projectessentials/projectessentials
30+
package_maven_repo_name=GitHubPackages
31+
package_maven_repo_mail=MairwunNx@gmail.com
32+
# Project Essentials dependencies
33+
permissions_version=1.15.2-1.0.1
34+
cooldown_version=1.15.2-1.0.1

0 commit comments

Comments
 (0)