Gradle7 jacoco report aggregation

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+      time: "17:00"
+      timezone: "Europe/Paris"
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of GitHub Actions workflows
+    schedule:
+      interval: "daily"
+      time: "17:00"
+      timezone: "Europe/Paris"

.github/workflows/coverage.yml

@@ -0,0 +1,39 @@
+name: Coverage
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test-and-coverage:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Set up Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: "8"
+          cache: gradle
+
+      - name: Ensure Gradle wrapper is executable
+        run: chmod +x ./gradlew
+
+      - name: Run tests and generate merged JaCoCo report
+        run: ./gradlew --no-daemon testCodeCoverageReport
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          fail_ci_if_error: true
+          verbose: true
+          files: build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+

.github/workflows/gradle-wrapper-validation.yml

@@ -6,6 +6,6 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1.0.3
+      - uses: actions/checkout@v6
+      - uses: gradle/wrapper-validation-action@v3.5.0
 

.github/workflows/manual-release.yml

@@ -0,0 +1,130 @@
+name: Manual Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_snapshot_version:
+        description: "Optional. Next snapshot version in x.y.z-SNAPSHOT format (example: 0.6.3-SNAPSHOT). If empty, we bump the patch number."
+        required: false
+        default: ""
+      version_file:
+        description: "Path to the Java file that contains the VERSION constant."
+        required: false
+        default: "Procyon.Core/src/main/java/com/strobel/Procyon.java"
+
+permissions:
+  contents: write
+
+concurrency:
+  group: manual-release-${{ github.ref }}
+  cancel-in-progress: false
+
+jobs:
+  release:
+    if: ${{ github.ref_type == 'branch' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+          ref: ${{ github.ref }}
+
+      - name: Prepare release, tag, and next snapshot
+        env:
+          VERSION_FILE: ${{ github.event.inputs.version_file }}
+          NEXT_SNAPSHOT_INPUT: ${{ github.event.inputs.next_snapshot_version }}
+          BRANCH_NAME: ${{ github.ref_name }}
+        run: |
+          set -euo pipefail
+
+          if [[ -z "${VERSION_FILE}" ]]; then
+            VERSION_FILE="Procyon.Core/src/main/java/com/strobel/Procyon.java"
+          fi
+
+          if [[ ! -f "${VERSION_FILE}" ]]; then
+            echo "Version file not found: ${VERSION_FILE}"
+            exit 1
+          fi
+
+          if [[ -n "$(git status --porcelain)" ]]; then
+            echo "Working tree is not clean. Please run the workflow from a clean branch state."
+            git status --porcelain
+            exit 1
+          fi
+
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+          version_line="$(grep -E 'private[[:space:]]+static[[:space:]]+final[[:space:]]+String[[:space:]]+VERSION[[:space:]]*=' "${VERSION_FILE}" | head -n 1 || true)"
+          if [[ -z "${version_line}" ]]; then
+            echo "Could not find VERSION constant in: ${VERSION_FILE}"
+            exit 1
+          fi
+
+          current_version="$(echo "${version_line}" | sed -E 's/.*VERSION[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/')"
+          if [[ -z "${current_version}" ]]; then
+            echo "Could not extract current version from VERSION constant in: ${VERSION_FILE}"
+            exit 1
+          fi
+
+          if [[ "${current_version}" != *-SNAPSHOT ]]; then
+            echo "Expected a -SNAPSHOT version, but found: ${current_version}"
+            exit 1
+          fi
+
+          release_version="${current_version%-SNAPSHOT}"
+
+          if [[ ! "${release_version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "Release version must be in x.y.z format. Found: ${release_version}"
+            exit 1
+          fi
+
+          if [[ -n "${NEXT_SNAPSHOT_INPUT}" ]]; then
+            next_snapshot_version="${NEXT_SNAPSHOT_INPUT}"
+          else
+            IFS='.' read -r major minor patch <<< "${release_version}"
+            patch=$((patch + 1))
+            next_snapshot_version="${major}.${minor}.${patch}-SNAPSHOT"
+          fi
+
+          if [[ ! "${next_snapshot_version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-SNAPSHOT$ ]]; then
+            echo "Next snapshot version must be in x.y.z-SNAPSHOT format. Found: ${next_snapshot_version}"
+            exit 1
+          fi
+
+          release_sed_expr="s/(private[[:space:]]+static[[:space:]]+final[[:space:]]+String[[:space:]]+VERSION[[:space:]]*=[[:space:]]*\")[^\"]+(\")/\1${release_version}\2/"
+          next_sed_expr="s/(private[[:space:]]+static[[:space:]]+final[[:space:]]+String[[:space:]]+VERSION[[:space:]]*=[[:space:]]*\")[^\"]+(\")/\1${next_snapshot_version}\2/"
+
+          # We set the version to the release version (remove -SNAPSHOT), then commit and push.
+          sed -i -E "${release_sed_expr}" "${VERSION_FILE}"
+
+          if git diff --quiet; then
+            echo "No changes after setting release version. Refusing to continue."
+            exit 1
+          fi
+
+          git add "${VERSION_FILE}"
+          git commit -m "prepare release ${release_version}"
+          git push origin "HEAD:${BRANCH_NAME}"
+
+          if git rev-parse -q --verify "refs/tags/${release_version}" >/dev/null; then
+            echo "Tag already exists: ${release_version}"
+            exit 1
+          fi
+
+          git tag "${release_version}"
+          git push origin "refs/tags/${release_version}"
+
+          # We set the version to the next development snapshot, then commit and push.
+          sed -i -E "${next_sed_expr}" "${VERSION_FILE}"
+
+          if git diff --quiet; then
+            echo "No changes after setting next snapshot version. Refusing to continue."
+            exit 1
+          fi
+
+          git add "${VERSION_FILE}"
+          git commit -m "prepare for next development iteration ${next_snapshot_version}"
+          git push origin "HEAD:${BRANCH_NAME}"

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')
 }

Procyon.CompilerTools/src/main/java/com/strobel/assembler/metadata/MethodDefinition.java

@@ -219,15 +219,17 @@ public int hashCode() {
 
     @Override
     public boolean equals(final Object obj) {
-        if (obj instanceof MethodDefinition) {
-            final MethodDefinition other = (MethodDefinition) obj;
-
-            return StringUtilities.equals(getName(), other.getName()) &&
-                   StringUtilities.equals(getErasedSignature(), other.getErasedSignature()) &&
-                   typeNamesMatch(getDeclaringType(), other.getDeclaringType());
+        if (obj == this) {
+            return true;
+        }
+        if (obj == null || obj.getClass() != getClass()) {
+            return false;
         }
+        final MethodDefinition other = (MethodDefinition) obj;
 
-        return false;
+        return StringUtilities.equals(getName(), other.getName()) &&
+               StringUtilities.equals(getErasedSignature(), other.getErasedSignature()) &&
+               typeNamesMatch(getDeclaringType(), other.getDeclaringType());
     }
 
     @Override
@@ -236,7 +238,7 @@ public void invalidateSignature() {
         _erasedSignature = null;
     }
 
-    private boolean typeNamesMatch(final TypeReference t1, final TypeReference t2) {
+    private static boolean typeNamesMatch(final TypeReference t1, final TypeReference t2) {
         return t1 != null &&
                t2 != null &&
                StringUtilities.equals(t1.getFullName(), t2.getFullName());

Procyon.CompilerTools/src/main/java/com/strobel/assembler/metadata/MethodReference.java

@@ -17,7 +17,6 @@
 package com.strobel.assembler.metadata;
 
 import com.strobel.core.StringUtilities;
-import com.strobel.core.VerifyArgument;
 import com.strobel.util.ContractUtils;
 
 import java.util.Collections;
@@ -28,21 +27,24 @@
  * Date: 1/6/13
  * Time: 2:29 PM
  */
-public abstract class MethodReference extends MemberReference implements IMethodSignature,
-                                                                         IGenericParameterProvider,
-                                                                         IGenericContext {
-    protected final static String CONSTRUCTOR_NAME = "<init>";
-    protected final static String STATIC_INITIALIZER_NAME = "<clinit>";
+public abstract class MethodReference extends MemberReference implements IMethodSignature {
+    protected static final String CONSTRUCTOR_NAME = "<init>";
+    protected static final String STATIC_INITIALIZER_NAME = "<clinit>";
 
     // <editor-fold defaultstate="collapsed" desc="Signature">
 
-    public abstract TypeReference getReturnType();
-
     public boolean hasParameters() {
         return !getParameters().isEmpty();
     }
 
-    public abstract List<ParameterDefinition> getParameters();
+    public boolean hasParameter(String name) {
+        for (ParameterDefinition parameterDefinition : getParameters()) {
+            if (parameterDefinition.getName().equals(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
     public List<TypeReference> getThrownTypes() {
         return Collections.emptyList();
@@ -117,11 +119,11 @@ protected StringBuilder appendName(final StringBuilder sb, final boolean fullNam
     }
 
     public boolean isConstructor() {
-        return MethodDefinition.CONSTRUCTOR_NAME.equals(getName());
+        return CONSTRUCTOR_NAME.equals(getName());
     }
 
     public boolean isTypeInitializer() {
-        return MethodDefinition.STATIC_INITIALIZER_NAME.equals(getName());
+        return STATIC_INITIALIZER_NAME.equals(getName());
     }
 
     // </editor-fold>
@@ -171,9 +173,9 @@ public GenericParameter findTypeVariable(final String name) {
     public MethodDefinition resolve() {
         final TypeReference declaringType = getDeclaringType();
 
-        if (declaringType == null)
+        if (declaringType == null) {
             throw ContractUtils.unsupported();
-
+        }
         return declaringType.resolve(this);
     }
 

Procyon.CompilerTools/src/main/java/com/strobel/decompiler/Decompiler.java

@@ -19,14 +19,21 @@
 import com.strobel.assembler.InputTypeLoader;
 import com.strobel.assembler.metadata.*;
 import com.strobel.core.VerifyArgument;
+import com.strobel.decompiler.languages.TypeDecompilationResults;
 import com.strobel.decompiler.languages.java.JavaFormattingOptions;
 
+import java.util.Collections;
+
 public final class Decompiler {
-    public static void decompile(final String internalName, final ITextOutput output) {
-        decompile(internalName, output, new DecompilerSettings());
+
+    private Decompiler() {
+    }
+
+    public static TypeDecompilationResults decompile(final String internalName, final ITextOutput output) {
+        return decompile(internalName, output, new DecompilerSettings());
     }
 
-    public static void decompile(final String internalName, final ITextOutput output, final DecompilerSettings settings) {
+    public static TypeDecompilationResults decompile(final String internalName, final ITextOutput output, final DecompilerSettings settings) {
         VerifyArgument.notNull(internalName, "internalName");
         VerifyArgument.notNull(settings, "settings");
 
@@ -53,7 +60,7 @@ public static void decompile(final String internalName, final ITextOutput output
 
         if (type == null || (resolvedType = type.resolve()) == null) {
             output.writeLine("!!! ERROR: Failed to load class %s.", internalName);
-            return;
+            return new TypeDecompilationResults(null);
         }
 
         DeobfuscationUtilities.processType(resolvedType);
@@ -67,6 +74,6 @@ public static void decompile(final String internalName, final ITextOutput output
             settings.setJavaFormattingOptions(JavaFormattingOptions.createDefault());
         }
 
-        settings.getLanguage().decompileType(resolvedType, output, options);
+        return settings.getLanguage().decompileType(resolvedType, output, options);
     }
 }