mstrobel · ThexXTURBOXx · Jan 8, 2022 · Mar 2, 2022
diff --git a/.idea/.name b/.idea/.name
diff --git a/Procyon.CompilerTools/build.gradle b/Procyon.CompilerTools/build.gradle
@@ -1,7 +1,7 @@
 compileTestJava.options.encoding = 'UTF-8'
 
 dependencies {
-    compile project(':Procyon.Core')
-    testCompile project(':Procyon.Reflection')
-    testCompile files('src/test/resources')
+    implementation project(':Procyon.Core')
+    testImplementation project(':Procyon.Reflection')
+    testImplementation files('src/test/resources')
 }
diff --git a/Procyon.Decompiler/build.gradle b/Procyon.Decompiler/build.gradle
@@ -1,17 +1,15 @@
-uploadArchives.enabled = false
-
 jar {
     manifest {
-        attributes 'Title': archivesBaseName, 'Manifest-Version': '1.0', 'Version': version, 'Main-Class' : 'com.strobel.decompiler.DecompilerDriver'
+        attributes 'Title': archivesBaseName, 'Manifest-Version': '1.0', 'Version': archiveVersion, 'Main-Class' : 'com.strobel.decompiler.DecompilerDriver'
     }
 
     from {
-        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
 }
 
 dependencies {
-    compile 'com.beust:jcommander:1.78'
-    compile project(':Procyon.Core')
-    compile project(':Procyon.CompilerTools')
+    implementation 'com.beust:jcommander:1.78'
+    implementation project(':Procyon.Core')
+    implementation project(':Procyon.CompilerTools')
 }
diff --git a/Procyon.Expressions/build.gradle b/Procyon.Expressions/build.gradle
@@ -1,10 +1,10 @@
 dependencies {
-    compile project(':Procyon.Core')
-    compile project(':Procyon.Reflection')
+    implementation project(':Procyon.Core')
+    implementation project(':Procyon.Reflection')
 }
 
 /*
 about the surefire plugin..
 
 http://forums.gradle.org/gradle/topics/does_anyone_know_how_to_configure_maven_surefire_plugin_with_gradle_for_unit_tests?page=1
-*/
+*/
diff --git a/Procyon.Reflection/build.gradle b/Procyon.Reflection/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
-    compile project(':Procyon.Core')
+    implementation project(':Procyon.Core')
 }
 
 /*
 see Expressions build.gradle file for surefire plugin
-*/
+*/
diff --git a/Procyon.Reflection/src/main/java/com/strobel/reflection/emit/CodeGenerator.java b/Procyon.Reflection/src/main/java/com/strobel/reflection/emit/CodeGenerator.java
@@ -1503,7 +1503,7 @@ private boolean tryEmitConstant(final Object value, final Type<?> type) {
                     return true;
                 }
                 if (unboxedType.isEnum()) {
-                    getField(unboxedType.getField(value.toString()));
+                    getField(unboxedType.getField(((Enum<?>)value).name()));
                     return true;
                 }
                 return false;
@@ -2908,4 +2908,4 @@ private void registerCheckedExceptions(final MethodBase method) {
     }
 
     // </editor-fold>
-}
+}
diff --git a/build.gradle b/build.gradle
@@ -2,8 +2,8 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 apply plugin: 'java'
-apply plugin: 'maven'
 apply plugin: 'idea'
+apply plugin: 'maven-publish'
 
 archivesBaseName = 'procyon'
 
@@ -35,7 +35,7 @@ final def procyonVersion = getProcyonVersion()
 allprojects {
     apply plugin: 'java'
     apply plugin: 'idea'
-    apply plugin: 'maven'
+    apply plugin: 'maven-publish'
 
     buildDir = rootDir.canonicalPath + "/build/" + rootProject.relativePath(projectDir.canonicalPath)
 
@@ -48,8 +48,13 @@ allprojects {
         mavenCentral()
     }
 
+    java {
+        withJavadocJar()
+        withSourcesJar()
+    }
+
     dependencies {
-        testCompile 'junit:junit:4.13.2'
+        testImplementation 'junit:junit:4.13.2'
     }
 }
 
@@ -58,10 +63,9 @@ allprojects {
 //
 rootProject.tasks.each { it.enabled = false }
 rootProject.tasks.withType(DefaultTask).each { it.enabled = true }
-rootProject.uploadArchives.enabled = false
 
 subprojects {
-    apply plugin: 'maven'
+    apply plugin: 'maven-publish'
     apply plugin: 'signing'
 
     final boolean shouldSign = "true".equalsIgnoreCase(System.properties.getProperty("procyon.signing.enabled"))
@@ -75,22 +79,12 @@ subprojects {
         }
     }
 
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = 'javadoc'
-        from 'build/docs/javadoc'
-    }
-
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = 'sources'
-        from sourceSets.main.allSource
-    }
-
     tasks.withType(Test) {
         testLogging {
             // set options for log level LIFECYCLE
             events TestLogEvent.FAILED,
-                   TestLogEvent.PASSED,
-                   TestLogEvent.SKIPPED
+                    TestLogEvent.PASSED,
+                    TestLogEvent.SKIPPED
             exceptionFormat TestExceptionFormat.FULL
             showExceptions true
             showCauses true
@@ -99,11 +93,11 @@ subprojects {
             // set options for log level DEBUG and INFO
             debug.with {
                 events TestLogEvent.STARTED,
-                       TestLogEvent.FAILED,
-                       TestLogEvent.PASSED,
-                       TestLogEvent.SKIPPED,
-                       TestLogEvent.STANDARD_ERROR,
-                       TestLogEvent.STANDARD_OUT
+                        TestLogEvent.FAILED,
+                        TestLogEvent.PASSED,
+                        TestLogEvent.SKIPPED,
+                        TestLogEvent.STANDARD_ERROR,
+                        TestLogEvent.STANDARD_OUT
                 exceptionFormat TestExceptionFormat.FULL
             }
 
@@ -125,8 +119,7 @@ subprojects {
         artifacts {
             archives jar
         }
-    }
-    else {
+    } else {
         javadoc {
             options.encoding = 'UTF-8'
         }
@@ -140,77 +133,65 @@ subprojects {
         if (shouldSign) {
             signing {
                 sign configurations.archives
+                sign publishing.publications.mavenJava
             }
         }
 
-        uploadArchives {
-            repositories.mavenDeployer {
-                if (shouldSign) {
-                    beforeDeployment { MavenDeployment deployment ->
-                        signing.signPom(deployment)
+        publishing {
+            repositories {
+                maven {
+                    name 'Snapshots'
+                    url 'https://oss.sonatype.org/content/repositories/snapshots'
+                    credentials {
+                        username = project.properties.get("procyon.sonatype.username")
+                        password = project.properties.get("procyon.sonatype.password")
                     }
                 }
-
-                snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots") {
-                    authentication(userName: project.properties.get("procyon.sonatype.username"),
-                                   password: project.properties.get("procyon.sonatype.password"))
-                }
-
-                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2") {
-                    authentication(userName: project.properties.get("procyon.sonatype.username"),
-                                   password: project.properties.get("procyon.sonatype.password"))
+                maven {
+                    name 'Releases'
+                    url 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
+                    credentials {
+                        username = project.properties.get("procyon.sonatype.username")
+                        password = project.properties.get("procyon.sonatype.password")
+                    }
                 }
-
-                pom {
+            }
+            publications {
+                mavenJava(MavenPublication) {
+                    from components.java
                     groupId = project.group
                     version = project.version
                     artifactId = project.archivesBaseName
-
-                    project {
-                        name project.archivesBaseName
-                        packaging 'jar'
-                        description 'Procyon'
-                        url 'https://github.com/mstrobel/procyon'
-
-                        scm {
-                            url 'https://github.com/mstrobel/procyon'
-                            connection 'scm:git:https://github.com/mstrobel/procyon.git'
-                            developerConnection 'scm:git:https://[email protected]/mstrobel/procyon.git'
-                        }
-
-                        issueManagement {
-                            system 'github'
-                            url 'https://github.com/mstrobel/procyon/issues'
-                        }
+                    pom {
+                        name = project.archivesBaseName
+                        description = 'Procyon'
+                        url = 'https://github.com/mstrobel/procyon'
 
                         licenses {
                             license {
-                                name 'The Apache Software License, Version 2.0'
-                                url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                                distribution 'repo'
+                                name = 'The Apache Software License, Version 2.0'
+                                url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                                distribution = 'repo'
                             }
                         }
 
                         developers {
                             developer {
-                                id 'mstrobel'
-                                name 'Mike Strobel'
-                                roles {
-                                    role 'owner'
-                                    role 'packager'
-                                    role 'developer'
-                                }
+                                id = 'mstrobel'
+                                name = 'Mike Strobel'
+                                roles = ['owner', 'packager', 'developer']
                             }
                         }
 
-                        dependencies {
-                            dependency {
-                                groupId 'junit'
-                                artifactId 'junit'
-                                version '4.11'
-                                scope 'test'
-//                                optional = true
-                            }
+                        scm {
+                            connection = 'scm:git:https://github.com/mstrobel/procyon.git'
+                            developerConnection = 'scm:git:https://[email protected]/mstrobel/procyon.git'
+                            url = 'https://github.com/mstrobel/procyon'
+                        }
+
+                        issueManagement {
+                            system = 'github'
+                            url = 'https://github.com/mstrobel/procyon/issues'
                         }
                     }
                 }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Oct 27 14:39:59 EDT 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists