build: Fixed main class name

redis · May 26, 2023 · e04073b · e04073b
1 parent bdb2540
commit e04073b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/core/riot-core/riot-core.gradle b/core/riot-core/riot-core.gradle
@@ -32,7 +32,6 @@ dependencies {
 }
 
 compileJava {
-    options.release = 8
     options.compilerArgs += ["-AprojectPath=${project.group}/${project.name}"]
 }
 

diff --git a/plugins/riot/riot.gradle b/plugins/riot/riot.gradle
@@ -33,20 +33,17 @@ application {
 
 jar {
     manifest {
-        attributes('Main-Class': 'com.redis.riot.cli.Main')
+        attributes([
+            'Main-Class': 'com.redis.riot.cli.Main',
+            'Automatic-Module-Name': project.findProperty('automatic.module.name')
+        ])        
     }
 }
 
 startScripts {
     classpath = files('$APP_HOME/lib/*')
 }
 
-jar {
-    manifest {
-        attributes('Main-Class': 'com.redis.riot.cli.Riot')
-    }
-}
-
 config {
     info {
         bytecodeVersion = 8
@@ -180,8 +177,4 @@ task copyGraalvmJavaSdk(type: Copy) {
     into 'build/dependencies/graalvm'
 }
 
-assemble.dependsOn copyDependencies, copyGraalvmJavaSdk
-
-compileJava {
-    options.release = 8
-}
+assemble.dependsOn copyDependencies, copyGraalvmJavaSdk
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,6 @@ dependencies { @@
     }
     compileJava {
-        options.release = 8
         options.compilerArgs += ["-AprojectPath=${project.group}/${project.name}"]
     }
@@ Expand Down @@