Many classes are no more managed as Listener (#11)

masesgroup · May 31, 2024 · a51b2f5 · a51b2f5
1 parent f45c140
commit a51b2f5
Show file tree

Hide file tree

Showing 42 changed files with 46 additions and 2,878 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -129,7 +129,9 @@ jobs:
 
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src\net\Netdroid\Netdroid.csproj
-
+        env:
+          GITHUB_SIMPLIFIED_GENERATION: true
+
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
         with: # running setup-java again overwrites the settings.xml
@@ -142,10 +144,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/netdroid/pom.xml
-        shell: bash
-
       - name: Create Jars for Netdroid
         run: mvn --file ./src/jvm/netdroid/pom.xml --no-transfer-progress package
         env:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -115,12 +115,9 @@ jobs:
     - name: Maven preparation (step 1)
       if: matrix.language == 'java' 
       run: dotnet build --no-incremental --configuration Release --framework net8.0 /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" ./src/net/Netdroid.sln
-
-    - name: Maven preparation (step 2)
-      if: matrix.language == 'java' 
-      run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/netdroid/pom.xml
-      shell: bash
-
+      env:
+        GITHUB_SIMPLIFIED_GENERATION: true
+
     - if: matrix.language == 'java' 
       run: mvn --file ./src/jvm/netdroid/pom.xml --no-transfer-progress package
 

diff --git a/.github/workflows/generateclasses.yaml b/.github/workflows/generateclasses.yaml
@@ -38,7 +38,7 @@ jobs:
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src\net\Netdroid\Netdroid.csproj
         env:
-          GITHUB_CLASS_GENERATION: true
+          GITHUB_SIMPLIFIED_GENERATION: true
 
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
@@ -52,10 +52,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/netdroid/pom.xml
-        shell: bash
-
       - name: Create Jars
         run: mvn --file ./src/jvm/netdroid/pom.xml --no-transfer-progress package
         env:

diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml
@@ -118,7 +118,9 @@ jobs:
 
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src\net\Netdroid\Netdroid.csproj
-
+        env:
+          GITHUB_SIMPLIFIED_GENERATION: true
+
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
         with: # running setup-java again overwrites the settings.xml
@@ -131,10 +133,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/netdroid/pom.xml
-        shell: bash
-
       - name: Create Jars
         run: mvn --file ./src/jvm/netdroid/pom.xml --no-transfer-progress package
         env:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -30,7 +30,9 @@ jobs:
 
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src\net\Netdroid\Netdroid.csproj
-
+        env:
+          GITHUB_SIMPLIFIED_GENERATION: true
+
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
         with: # running setup-java again overwrites the settings.xml
@@ -43,10 +45,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/netdroid/pom.xml
-        shell: bash
-
       - name: Create Jars
         run: mvn --file ./src/jvm/netdroid/pom.xml --no-transfer-progress package
         env:

diff --git a/src/configuration.json b/src/configuration.json
@@ -11,7 +11,7 @@
   ],
   "OriginJavadocJARVersionAndUrls": [
     {
-      "Version": 17,
+      "Version": 11,
       "Url": "https://developer.android.com/reference/"
     }
   ],
@@ -31,6 +31,35 @@
     "javax.swing.Action",
     "javax.management.NotificationFilter"
   ],
+  "ClassesToAvoidJavaListener": [
+    "android.bluetooth.BluetoothAdapter",
+    "android.content.AbstractThreadedSyncAdapter",
+    "android.hardware.TriggerEventListener",
+    "android.net.wifi.aware.IdentityChangedListener",
+    "android.nfc.NfcAdapter",
+    "android.os.storage.OnObbStateChangeListener",
+    "android.print.PrintDocumentAdapter",
+    "android.speech.tts.UtteranceProgressListener",
+    "android.telephony.OnOpportunisticSubscriptionsChangedListener",
+    "android.telephony.OnSubscriptionsChangedListener",
+    "android.telephony.ims.RcsUceAdapter",
+    "android.telephony.mbms.DownloadProgressListener",
+    "android.telephony.mbms.DownloadStatusListener",
+    "android.text.method.DateKeyListener",
+    "android.text.method.DateTimeKeyListener",
+    "android.text.method.DialerKeyListener",
+    "android.text.method.DigitsKeyListener",
+    "android.text.method.MetaKeyKeyListener",
+    "android.text.method.QwertyKeyListener",
+    "android.text.method.TimeKeyListener",
+    "android.widget.ResourceCursorAdapter",
+    "android.widget.ResourceCursorTreeAdapter",
+    "android.widget.SimpleCursorAdapter",
+    "android.widget.SimpleCursorTreeAdapter",
+    "android.widget.SimpleExpandableListAdapter",
+    "android.view.OrientationEventListener",
+    "android.view.accessibility.CaptioningChangeListener"
+  ],
   "ClassesToAvoid": [
     "android.R",
     "android.widget.ArrayAdapter",

diff --git a/src/container/DockerfileKNet.linux b/src/container/DockerfileKNet.linux
diff --git a/src/container/DockerfileKNetConnect.linux b/src/container/DockerfileKNetConnect.linux
diff --git a/src/jvm/netdroid/pom.xml b/src/jvm/netdroid/pom.xml
@@ -43,6 +43,7 @@
         <netdroidVersion>1.0.0.0</netdroidVersion>
         <jcobridgeVersion>2.5.13</jcobridgeVersion>
 		<jcobridgepath>../../../bin/net8.0/JCOBridge.jar</jcobridgepath>
+		<androidJarPath>${env.ANDROID_HOME}/platforms/android-34-ext8/android.jar</androidJarPath>
     </properties>
     <distributionManagement>
         <snapshotRepository>
@@ -134,7 +135,7 @@
                 <configuration>
                     <compilerArgs>
                         <arg>-cp</arg>
-                        <arg>${originalClassPath}${path.separator}${basedir}/${jcobridgepath}</arg>
+                        <arg>${originalClassPath}${path.separator}${basedir}/${jcobridgepath}${path.separator}${androidJarPath}</arg>
                     </compilerArgs>
                 </configuration>
             </plugin>
@@ -143,53 +144,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.0</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/target/</exclude>
-                                <exclude>**/*.xml</exclude>
-                                <exclude>**/*.zip</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.6.0</version>
-                <configuration>
-                    <links>
-                        <link>https://www.jcobridge.com/api-java</link>
-                    </links>
-                    <quiet>true</quiet>
-                    <source>8</source>
-                    <additionalDependencies>
-                        <additionalDependency>
-                            <groupId>JCOBridge</groupId>
-                            <artifactId>JCOBridge</artifactId>
-                            <version>${jcobridgeVersion}</version>
-                        </additionalDependency>
-                    </additionalDependencies>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>

diff --git a/...src/main/java/org/mases/netdroid/generated/android/animation/AnimatorListenerAdapter.java b/...src/main/java/org/mases/netdroid/generated/android/animation/AnimatorListenerAdapter.java