build: change Gradle DSL to Kotlin (#52)

* build: change Gradle DSL to Kotlin * chore: chmod +x for gradlew * ci: update sduoj-server building * ci: skip test * build: update Dockerfile * build: update Dockerfile * fix: missing spring-boot-plugin causes bytecode without MethodParameters * build: accpet gradle ToS automatically * build: switch to aliyun source
SDUOJ · Feb 21, 2022 · 4c199fd · 4c199fd
1 parent cf86862
commit 4c199fd
Show file tree

Hide file tree

Showing 20 changed files with 235 additions and 264 deletions.
diff --git a/.github/workflows/ci.yml → .github/workflows/compilation.yml b/.github/workflows/ci.yml → .github/workflows/compilation.yml
@@ -1,9 +1,10 @@
-name: CI
+name: Compilation
 
 on:
   pull_request:
     branches: 
       - master
+  workflow_dispatch: # add manually button
 
 jobs:
   build:
@@ -24,23 +25,17 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/*.java') }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/*.java') }}-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: ${{ runner.os }}-m2-${{ hashFiles('**/*.java') }}-${{ hashFiles('**/*.gradle.kts') }}
 
-      - name: Install if cache not hit
+      - name: PublishToMavenLocal if not hit cache
         if: steps.cache-sduoj-server-interface.outputs.cache-hit != 'true'
         run: |
-          chmod +x ./mvnw
-          ./mvnw install \
-              --projects sduoj-submit/sduoj-submit-interface \
-              --projects sduoj-problem/sduoj-problem-interface \
-              --projects sduoj-filesys/sduoj-filesys-interface \
-              --also-make \
-              --no-transfer-progress \
-              --batch-mode \
-              -Dmaven.test.skip=true \
+          chmod +x ./gradlew
+          ./gradlew publishToMavenLocal -x test
 
       - uses: actions/checkout@v2
+
       - run: |
           chmod +x ./gradlew
           ./gradlew build
diff --git a/Dockerfile b/Dockerfile
@@ -1,72 +1,62 @@
-FROM ubuntu:18.04
-MAINTAINER SDUOJ-Team
-
-ENV LANG C.UTF-8
-
-COPY docker/sources.list /etc/apt/sources.list
-COPY docker/mavenSettings.xml /usr/share/maven/conf/settings.xml
-COPY docker/testlib /testlib.h
-COPY docker/checkers/ /checkers/
-
-ADD https://github.com/SDUOJ/docker-compose-wait/releases/download/2.7.3/wait /wait
-RUN mkdir /sduoj \
- && chmod +x /wait
-
-# install OS softwares
-RUN apt-get update \
- && apt-get install -qq -y \
-                    make=4.1-9.1ubuntu1   dosbox=0.74-4.3 cmake \
-                    sudo git unzip wget libseccomp-dev libseccomp2 seccomp build-essential \
-                    python3-pip python vim dos2unix openjdk-8-jdk \
- && mkdir /usr/share/maven/conf/logging \
- && ln -sf /usr/lib/jvm/java-8-openjdk-amd64/bin/java /usr/bin/java \
- && ln -sf /usr/lib/jvm/java-8-openjdk-amd64/bin/javac /usr/bin/javac
-
-# compile and install sduoj-sandbox
-RUN wget -q -O /sduoj/sandbox.zip https://codeload.github.com/SDUOJ/sduoj-sandbox/zip/master \
- && unzip -o -q -d /sduoj /sduoj/sandbox.zip \
- && rm /sduoj/sandbox.zip \
- && cd /sduoj/sduoj-sandbox* \
- && make \
- && make install
-
-# download source code
-RUN wget -q -O /sduoj/server.zip https://codeload.github.com/SDUOJ/sduoj-server/zip/master \
- && wget -q -O /sduoj/judger.zip https://codeload.github.com/SDUOJ/sduoj-judger/zip/master \
- && unzip -o -q -d /sduoj/dockerWorkspace /sduoj/server.zip \
- && unzip -o -q -d /sduoj/dockerWorkspace /sduoj/judger.zip \
- && rm /sduoj/server.zip \
- && rm /sduoj/judger.zip
-
-# compile and install sduoj-server
-RUN cd /sduoj/dockerWorkspace/sduoj-server* \
- && chmod +x ./mvnw \
- && ./mvnw install \
-           --projects sduoj-submit/sduoj-submit-interface \
-           --projects sduoj-problem/sduoj-problem-interface \
-           --projects sduoj-filesys/sduoj-filesys-interface \
-           --also-make \
-           --no-transfer-progress \
-           --batch-mode \
-           -Dmaven.test.skip=true \
-           -T `nproc`\
-# compile sduoj-judger
- && cd /sduoj/dockerWorkspace/sduoj-judger* \
- && chmod +x ./gradlew \
- && ./gradlew build \
- && mv ./sduoj-judger-service/build/libs/sduoj-judger.jar /sduoj/sduoj-judger.jar \
-# clean
- && rm -rf ~/.m2 \
- && rm -rf ~/.gradle \
- && rm -rf /sduoj/dockerWorkspace
-
-ENV NACOS_ADDR=nacos.oj.qd.sdu.edu.cn:8848
-ENV ACTIVE=prod
-
-WORKDIR /sduoj
-
-CMD /wait \
- && java -jar sduoj-judger.jar \
-         --sduoj.config.nacos-addr=$NACOS_ADDR \
-         --sduoj.config.active=$ACTIVE \
-         >> /sduoj/sduoj.log
+FROM ubuntu:18.04
+MAINTAINER SDUOJ-Team
+
+ENV LANG C.UTF-8
+
+COPY docker/sources.list /etc/apt/sources.list
+COPY docker/testlib /testlib.h
+COPY docker/checkers/ /checkers/
+
+ADD https://github.com/SDUOJ/docker-compose-wait/releases/download/2.7.3/wait /wait
+RUN mkdir -p /sduoj/dockerWorkspace \
+ && chmod +x /wait
+
+# install OS softwares
+RUN apt-get update \
+ && apt-get install -qq -y \
+                    make=4.1-9.1ubuntu1   dosbox=0.74-4.3 cmake \
+                    sudo git unzip wget libseccomp-dev libseccomp2 seccomp build-essential \
+                    python3-pip python vim dos2unix openjdk-8-jdk \
+ && ln -sf /usr/lib/jvm/java-8-openjdk-amd64/bin/java /usr/bin/java \
+ && ln -sf /usr/lib/jvm/java-8-openjdk-amd64/bin/javac /usr/bin/javac
+
+# compile and install sduoj-sandbox
+RUN wget -q -O /sduoj/sandbox.zip https://codeload.github.com/SDUOJ/sduoj-sandbox/zip/master \
+ && unzip -o -q -d /sduoj /sduoj/sandbox.zip \
+ && rm /sduoj/sandbox.zip \
+ && cd /sduoj/sduoj-sandbox* \
+ && make \
+ && make install
+
+# download source code
+RUN wget -q -O /sduoj/server.zip https://codeload.github.com/SDUOJ/sduoj-server/zip/master \
+ && wget -q -O /sduoj/judger.zip https://codeload.github.com/SDUOJ/sduoj-judger/zip/master \
+ && unzip -o -q -d /sduoj/dockerWorkspace /sduoj/server.zip \
+ && unzip -o -q -d /sduoj/dockerWorkspace /sduoj/judger.zip \
+ && rm /sduoj/server.zip \
+ && rm /sduoj/judger.zip
+
+# compile and install sduoj-server
+RUN cd /sduoj/dockerWorkspace/sduoj-server* \
+ && chmod +x ./gradlew \
+ && ./gradlew publishToMavenLocal -x test \
+# compile sduoj-judger
+ && cd /sduoj/dockerWorkspace/sduoj-judger* \
+ && chmod +x ./gradlew \
+ && ./gradlew build \
+ && mv ./sduoj-judger-service/build/libs/sduoj-judger.jar /sduoj/sduoj-judger.jar \
+# clean
+ && rm -rf ~/.m2 \
+ && rm -rf ~/.gradle \
+ && rm -rf /sduoj/dockerWorkspace
+
+ENV NACOS_ADDR=nacos.oj.qd.sdu.edu.cn:8848
+ENV ACTIVE=prod
+
+WORKDIR /sduoj
+
+CMD /wait \
+ && java -jar sduoj-judger.jar \
+         --sduoj.config.nacos-addr=$NACOS_ADDR \
+         --sduoj.config.active=$ACTIVE \
+         >> /sduoj/sduoj.log
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -0,0 +1,4 @@
+extensions.findByName("buildScan")?.withGroovyBuilder {
+    setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")
+    setProperty("termsOfServiceAgree", "yes")
+}
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -0,0 +1,21 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+plugins {
+    // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build.
+    `kotlin-dsl`
+}
+
+repositories {
+    // Use the plugin portal to apply community plugins in convention plugins.
+    gradlePluginPortal()
+}
+
+val springBootVersion: String by project
+val dependencyManagementPluginVersion: String by project
+
+dependencies {
+    implementation("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
+    implementation("io.spring.gradle:dependency-management-plugin:$dependencyManagementPluginVersion")
+}
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
@@ -0,0 +1,2 @@
+springBootVersion=2.1.12.RELEASE
+dependencyManagementPluginVersion=1.0.11.RELEASE
diff --git a/buildSrc/src/main/groovy/cn.edu.sdu.qd.oj.judger.java-conventions.gradle b/buildSrc/src/main/groovy/cn.edu.sdu.qd.oj.judger.java-conventions.gradle
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -0,0 +1,15 @@
+object Versions {
+    val sduoj = "1.0.0-SNAPSHOT"
+
+    val springCloud = "Greenwich.SR5"
+    val springCloudAlibaba = "2.1.2.RELEASE"
+
+    val lombok = "1.18.12"
+    val commonsLang3 = "3.11"
+    val fastjson = "1.2.73"
+    val aspectj = "1.9.5"
+    val guava = "29.0-jre"
+    val slf4j = "1.7.30"
+    val jackson = "2.9.10" // TODO: upgrade
+    val httpclient = "4.5.12"
+}
diff --git a/buildSrc/src/main/kotlin/cn.edu.sdu.qd.oj.judger.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/cn.edu.sdu.qd.oj.judger.java-conventions.gradle.kts
@@ -0,0 +1,67 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+plugins {
+    `java-library`
+    `maven-publish`
+    id("org.springframework.boot")
+    id("io.spring.dependency-management")
+}
+
+group = "cn.edu.sdu.qd.oj.judger"
+version = Versions.sduoj
+
+java.sourceCompatibility = JavaVersion.VERSION_1_8
+java.targetCompatibility = JavaVersion.VERSION_1_8
+
+
+repositories {
+    maven { url = uri("https://maven.aliyun.com/repository/public/") }
+    maven { url = uri("https://maven.aliyun.com/repository/spring/") }
+    mavenLocal()
+//    mavenCentral()
+}
+
+dependencies {
+    implementation("org.projectlombok:lombok:${Versions.lombok}")
+    annotationProcessor("org.projectlombok:lombok:${Versions.lombok}")
+}
+
+
+dependencyManagement {
+    imports {
+        mavenBom("org.springframework.cloud:spring-cloud-dependencies:${Versions.springCloud}")
+        mavenBom("com.alibaba.cloud:spring-cloud-alibaba-dependencies:${Versions.springCloudAlibaba}")
+    }
+}
+
+allprojects {
+    val projectName = this.name
+    val isService = projectName.contains(Regex("-(service)$"))
+    if (isService) {
+        tasks.bootJar {
+            enabled = true
+            archiveName = projectName.replace("-service", "") + ".jar"
+        }
+        tasks.jar {
+            enabled = false
+        }
+    } else {
+        tasks.bootJar {
+            enabled = false
+        }
+        tasks.jar {
+            enabled = true
+        }
+        publishing {
+            publications.create<MavenPublication>("maven") {
+                artifact(tasks.jar)
+            }
+        }
+    }
+}
+
+tasks.withType<JavaCompile>() {
+    options.encoding = "UTF-8"
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		springBootVersion=2.1.12.RELEASE
		dependencyManagementPluginVersion=1.0.11.RELEASE