ci: more CI testing hwo it's different than local

Author: ktoso

.github/workflows/pull_request.yml

@@ -176,29 +176,29 @@ jobs:
       - name: Swift Test
         run: "swift test"
 
-  build-swift-android:
-    name: Sample SwiftJavaExtractJNISampleApp (Android) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} android:${{matrix.sdk_triple}})
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        swift_version: ['nightly-main']
-        os_version: ['jammy']
-        jdk_vendor: ['corretto']
-        sdk_triple: ['x86_64-unknown-linux-android28']
-        ndk_version: ['r27d']
-    container:
-      image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Prepare CI Environment
-        uses: ./.github/actions/prepare_env
-      - name: Install Swift SDK for Android and build
-        run: |
-          apt-get -q update && apt-get -yq install curl
-          cd Samples/SwiftJavaExtractJNISampleApp
-          curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
-          bash -s -- --android --build-command="swift build" --android-sdk-triple="${{ matrix.sdk_triple }}" --android-ndk-version="${{ matrix.ndk_version }}" ${{ matrix.swift_version }}
+  # build-swift-android:
+  #   name: Sample SwiftJavaExtractJNISampleApp (Android) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} android:${{matrix.sdk_triple}})
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       swift_version: ['nightly-main']
+  #       os_version: ['jammy']
+  #       jdk_vendor: ['corretto']
+  #       sdk_triple: ['x86_64-unknown-linux-android28']
+  #       ndk_version: ['r27d']
+  #   container:
+  #     image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - name: Prepare CI Environment
+  #       uses: ./.github/actions/prepare_env
+  #     - name: Install Swift SDK for Android and build
+  #       run: |
+  #         apt-get -q update && apt-get -yq install curl
+  #         cd Samples/SwiftJavaExtractJNISampleApp
+  #         curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
+  #         bash -s -- --android --build-command="swift build" --android-sdk-triple="${{ matrix.sdk_triple }}" --android-ndk-version="${{ matrix.ndk_version }}" ${{ matrix.swift_version }}
 
   verify-samples:
     name: Sample ${{ matrix.sample_app }} (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
@@ -210,12 +210,12 @@ jobs:
         os_version: ['jammy']
         jdk_vendor: ['corretto']
         sample_app: [  # TODO: use a reusable-workflow to generate those names
-          'JavaDependencySampleApp',
-          'JavaKitSampleApp',
-          'JavaProbablyPrime',
-          'JavaSieve',
-          'SwiftAndJavaJarSampleLib',
-          'SwiftJavaExtractFFMSampleApp',
+          # 'JavaDependencySampleApp',
+          # 'JavaKitSampleApp',
+          # 'JavaProbablyPrime',
+          # 'JavaSieve',
+          # 'SwiftAndJavaJarSampleLib',
+          # 'SwiftJavaExtractFFMSampleApp',
           'SwiftJavaExtractJNISampleApp',
         ]
     container:
@@ -242,12 +242,12 @@ jobs:
         os_version: ['macos']
         jdk_vendor: ['corretto']
         sample_app: [  # TODO: use a reusable-workflow to generate those names
-          'JavaDependencySampleApp',
-          'JavaKitSampleApp',
-          'JavaProbablyPrime',
-          'JavaSieve',
-          'SwiftAndJavaJarSampleLib',
-          'SwiftJavaExtractFFMSampleApp',
+          # 'JavaDependencySampleApp',
+          # 'JavaKitSampleApp',
+          # 'JavaProbablyPrime',
+          # 'JavaSieve',
+          # 'SwiftAndJavaJarSampleLib',
+          # 'SwiftJavaExtractFFMSampleApp',
           'SwiftJavaExtractJNISampleApp',
         ]
     steps:

Samples/SwiftJavaExtractJNISampleApp/ci-validate.sh

@@ -6,6 +6,9 @@ set -e
 # GitHub Actions workaround; We seem to be hitting gradle wrapper download issues, and this attempts to workaround them
 ./gradlew -h
 
+which gradle
+echo $PATH
+
 GRADLE_USER_HOME="$(pwd)/.build/plugins/outputs/swiftjavaextractjnisampleapp/MySwiftLibrary/destination/JExtractSwiftPlugin/gradle-user-home"
 if [ -d "$HOME/.gradle" ] ; then
   echo "COPY $HOME/.gradle to $GRADLE_USER_HOME"

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -318,7 +318,7 @@ extension JNISwift2JavaGenerator {
           #".init(name: "\#(name)", signature: "\#(signature.mangledName)")"#
       }.joined(separator: ",\n")
 
-      return #"_JNIMethodIDCache(environment: try! JavaVirtualMachine.shared().environment(), className: "\#(fullClassName)", methods: [\#(methods)])"#
+      return #"_JNIMethodIDCache(className: "\#(fullClassName)", methods: [\#(methods)])"#
   }
 
   private func printEnumGetAsCaseThunk(