Merge branch 'master' into fix/invoke-dynamic-fallback

MobiVM · Feb 28, 2024 · ec1d991 · ec1d991
2 parents d0d2c0a + 991927c
commit ec1d991
Show file tree

Hide file tree

Showing 47 changed files with 97 additions and 86 deletions.
diff --git a/compiler/cacerts/full/pom.xml b/compiler/cacerts/full/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>robovm-cacerts-parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>robovm-cacerts-full</artifactId>

diff --git a/compiler/cacerts/pom.xml b/compiler/cacerts/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mobidevelop.robovm</groupId>
     <artifactId>robovm-compiler-parent</artifactId>
-    <version>2.3.21-SNAPSHOT</version>
+    <version>2.3.22-SNAPSHOT</version>
   </parent>
 
   <artifactId>robovm-cacerts-parent</artifactId>

diff --git a/compiler/cocoatouch/pom.xml b/compiler/cocoatouch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>robovm-compiler-parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>robovm-cocoatouch</artifactId>

diff --git a/compiler/compiler/pom.xml b/compiler/compiler/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>robovm-compiler-parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>robovm-compiler</artifactId>

diff --git a/compiler/compiler/src/main/java/org/robovm/compiler/target/ios/DeviceType.java b/compiler/compiler/src/main/java/org/robovm/compiler/target/ios/DeviceType.java
@@ -41,11 +41,10 @@
  */
 public class DeviceType implements Comparable<DeviceType> {
     public static final String IOS_VERSION_PREFIX = "com.apple.CoreSimulator.SimRuntime.iOS-";
-    public static final String PREFERRED_IPHONE_SIM_NAME = "iPhone 8";
+    public static final String PREFERRED_IPHONE_SIM_NAME = "iPhone SE";
     public static final String PREFERRED_IPAD_SIM_NAME = "iPad Air";
 
     public static final String[] ONLY_32BIT_DEVICES = {"iPhone 4", "iPhone 4s", "iPhone 5", "iPhone 5c", "iPad 2"};
-    public static final Version ONLY_64BIT_IOS_VERSION = new Version(11, 0, 0);
     public static final Version ARM64_IOS_VERSION = new Version(14, 0, 0);
 
     public enum DeviceFamily {
@@ -309,7 +308,7 @@ public static DeviceType getBestDeviceType(Arch arch, DeviceFamily family,
                 // match for specified device
                 if (exact == null || (version == null && type.version.versionCode > exact.version.versionCode))
                     exact = type;
-            } else if (deviceName == null && type.getDeviceName().equals(preferredDeviceName)) {
+            } else if (deviceName == null && type.getDeviceName().startsWith(preferredDeviceName)) {
                 // match for preferable device
                 if (bestDefault == null || (version == null && type.version.versionCode > bestDefault.version.versionCode))
                     bestDefault = type;

diff --git a/compiler/libimobiledevice/pom.xml b/compiler/libimobiledevice/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>robovm-compiler-parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>robovm-libimobiledevice</artifactId>

diff --git a/compiler/llvm/pom.xml b/compiler/llvm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>robovm-compiler-parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>robovm-llvm</artifactId>

diff --git a/compiler/objc/pom.xml b/compiler/objc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>robovm-compiler-parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>robovm-objc</artifactId>

diff --git a/compiler/pom.xml b/compiler/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>robovm-parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>robovm-compiler-parent</artifactId>

diff --git a/compiler/rt/pom.xml b/compiler/rt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>robovm-compiler-parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>robovm-rt</artifactId>

diff --git a/dist/compiler/pom.xml b/dist/compiler/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>robovm-dist-parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>robovm-dist-compiler</artifactId>

diff --git a/dist/package/pom.xml b/dist/package/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>robovm-dist-parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>robovm-dist</artifactId>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mobidevelop.robovm</groupId>
     <artifactId>robovm-parent</artifactId>
-    <version>2.3.21-SNAPSHOT</version>
+    <version>2.3.22-SNAPSHOT</version>
   </parent>
 
   <artifactId>robovm-dist-parent</artifactId>

diff --git a/plugins/debugger/pom.xml b/plugins/debugger/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>robovm-parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/plugins/eclipse/feature/feature.xml b/plugins/eclipse/feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.robovm.eclipse.feature"
       label="RoboVM for Eclipse"
-      version="2.3.21.qualifier"
+      version="2.3.22.qualifier"
       provider-name="RoboVM AB">
 
    <description url="http://www.robovm.com">

diff --git a/plugins/eclipse/feature/pom.xml b/plugins/eclipse/feature/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>org.robovm.eclipse.parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.robovm.eclipse.feature</artifactId>

diff --git a/plugins/eclipse/pom.xml b/plugins/eclipse/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.mobidevelop.robovm</groupId>
-    <version>2.3.21-SNAPSHOT</version>
+    <version>2.3.22-SNAPSHOT</version>
     <artifactId>org.robovm.eclipse.parent</artifactId>
     <name>RoboVM for Eclipse</name>
     <packaging>pom</packaging>
@@ -28,7 +28,7 @@
     </licenses>
 
     <properties>
-        <robovm.version>2.3.21-SNAPSHOT</robovm.version>
+        <robovm.version>2.3.22-SNAPSHOT</robovm.version>
         <tycho.version>3.0.3</tycho.version>
         <eclipse-site>https://download.eclipse.org/releases/2021-09/</eclipse-site>
     </properties>

diff --git a/plugins/eclipse/ui/META-INF/MANIFEST.MF b/plugins/eclipse/ui/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jdt.junit,
  org.eclipse.jdt.junit.runtime,
  org.eclipse.jdt.junit4.runtime
-Bundle-Version: 2.3.21.qualifier
+Bundle-Version: 2.3.22.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.robovm.eclipse.RoboVMPlugin
 Bundle-SymbolicName: org.robovm.eclipse.ui;singleton:=true

diff --git a/plugins/eclipse/ui/pom.xml b/plugins/eclipse/ui/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>org.robovm.eclipse.parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.robovm.eclipse.ui</artifactId>

diff --git a/plugins/eclipse/update-site/category.xml b/plugins/eclipse/update-site/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.robovm.eclipse.feature_2.3.21.qualifier.jar" id="org.robovm.eclipse.feature" version="2.3.21.qualifier">
+   <feature url="features/org.robovm.eclipse.feature_2.3.22.qualifier.jar" id="org.robovm.eclipse.feature" version="2.3.22.qualifier">
        <category name="robovm"/>
    </feature>
    <category-def name="robovm" label="RoboVM for Eclipse"/>

diff --git a/plugins/eclipse/update-site/pom.xml b/plugins/eclipse/update-site/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>org.robovm.eclipse.parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.robovm.eclipse.update-site</artifactId>

diff --git a/plugins/gradle/build.gradle b/plugins/gradle/build.gradle
@@ -10,7 +10,7 @@ plugins {
 
 group = 'com.mobidevelop.robovm'
 archivesBaseName = 'robovm-gradle-plugin'
-version = '2.3.21-SNAPSHOT'
+version = '2.3.22-SNAPSHOT'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -20,7 +20,7 @@ compileJava {
 }
 
 ext {
-    roboVMVersion = '2.3.21-SNAPSHOT'
+    roboVMVersion = '2.3.22-SNAPSHOT'
     nexusUsername = System.getenv('MAVEN_USERNAME')
     nexusPassword = System.getenv('MAVEN_PASSWORD')
 }

diff --git a/plugins/ibxcode/pom.xml b/plugins/ibxcode/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.mobidevelop.robovm</groupId>
         <artifactId>robovm-parent</artifactId>
-        <version>2.3.21-SNAPSHOT</version>
+        <version>2.3.22-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/plugins/idea/build.gradle b/plugins/idea/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 ext {
-    roboVMVersion = '2.3.21-SNAPSHOT'
+    roboVMVersion = '2.3.22-SNAPSHOT'
 }
 
 group 'com.mobidevelop.robovm'
@@ -36,10 +36,12 @@ dependencies {
         exclude group: 'com.mobidevelop.robovm', module: 'robovm-templates-console'
     }
     robovm_dist "com.mobidevelop.robovm:robovm-dist:${roboVMVersion}:[email protected]"
+
+    implementation 'org.apache.commons:commons-compress:1.25.0'
 }
 
 intellij {
-    version = '2021.1'   // we are compiles against this API version
+    version = '2022.3'   // we are compiles against this API version
     plugins = ['java', 'maven', 'gradle']
     updateSinceUntilBuild = false
 }

diff --git a/plugins/idea/pom.xml b/plugins/idea/pom.xml
@@ -4,13 +4,13 @@
     <groupId>com.mobidevelop.robovm</groupId>
     <artifactId>org.robovm.idea</artifactId>
     <name>RoboVM plugin for Intellij IDEA</name>
-    <version>2.3.21-SNAPSHOT</version>
+    <version>2.3.22-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
         <ij.plugin>true</ij.plugin>
         <ij.pluginDescriptor>src/main/resources/META-INF/plugin.xml</ij.pluginDescriptor>
-        <robovm.version>2.3.21-SNAPSHOT</robovm.version>
+        <robovm.version>2.3.22-SNAPSHOT</robovm.version>
     </properties>
 
     <scm>

diff --git a/plugins/idea/src/main/java/org/robovm/idea/RoboVmPlugin.java b/plugins/idea/src/main/java/org/robovm/idea/RoboVmPlugin.java
@@ -42,7 +42,7 @@
 import com.intellij.ui.content.Content;
 import com.intellij.util.PlatformUtils;
 import com.intellij.util.ui.UIUtil;
-import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -325,7 +325,7 @@ private static void extractArchive(String archive, File dest) {
         archive = "/" + archive;
         try (TarArchiveInputStream in = new TarArchiveInputStream(new GZIPInputStream(RoboVmPlugin.class.getResourceAsStream(archive)))) {
             boolean filesWereUpdated = false;
-            ArchiveEntry entry;
+            TarArchiveEntry entry;
             while ((entry = in.getNextEntry()) != null) {
                 File f = new File(dest, entry.getName());
                 if (entry.isDirectory()) {

diff --git a/plugins/idea/src/main/java/org/robovm/idea/actions/ASNewProjectAction.java b/plugins/idea/src/main/java/org/robovm/idea/actions/ASNewProjectAction.java
@@ -29,11 +29,6 @@ public class ASNewProjectAction extends AnAction {
     public ASNewProjectAction() {
     }
 
-    @Override
-    public boolean startInTransaction() {
-        return true;
-    }
-
     @Override
     public void actionPerformed(@NotNull AnActionEvent e) {
         NewProjectWizard wizard = new NewProjectWizard(null, ModulesProvider.EMPTY_MODULES_PROVIDER, null);

diff --git a/plugins/idea/src/main/java/org/robovm/idea/actions/CleanBuildFoldersAction.java b/plugins/idea/src/main/java/org/robovm/idea/actions/CleanBuildFoldersAction.java
@@ -18,6 +18,7 @@
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.module.Module;
@@ -47,6 +48,11 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         }
     }
 
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
+
     @Override
     public void update(AnActionEvent e) {
         e.getPresentation().setEnabled(!busy.get());

diff --git a/plugins/idea/src/main/java/org/robovm/idea/actions/CleanRoboVmCacheAction.java b/plugins/idea/src/main/java/org/robovm/idea/actions/CleanRoboVmCacheAction.java
@@ -18,14 +18,14 @@
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
 import org.apache.commons.io.FileUtils;
 import org.jetbrains.annotations.NotNull;
-import org.robovm.idea.ibxcode.RoboVmIbXcodeProjectTask;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,6 +43,11 @@ public void actionPerformed(AnActionEvent anActionEvent) {
             ProgressManager.getInstance().run(new CleanTask());
     }
 
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
+
     @Override
     public void update(AnActionEvent e) {
         e.getPresentation().setEnabled(!busy.get());

diff --git a/plugins/idea/src/main/java/org/robovm/idea/actions/GenerateXCodeProjectAction.java b/plugins/idea/src/main/java/org/robovm/idea/actions/GenerateXCodeProjectAction.java
@@ -15,6 +15,7 @@
  */
 package org.robovm.idea.actions;
 
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.LangDataKeys;
@@ -56,6 +57,11 @@ private Module workaroundModuleGroupingIssue(Module module) {
         return module;
     }
 
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.BGT;
+    }
+
     @Override
     public void update(AnActionEvent e) {
         e.getPresentation().setEnabled(!RoboVmIbXcodeProjectTask.isBusy() && isValidModuleEvent(e));

diff --git a/...s/idea/src/main/java/org/robovm/idea/running/RoboVmIOSRunConfigurationSettingsEditor.form b/...s/idea/src/main/java/org/robovm/idea/running/RoboVmIOSRunConfigurationSettingsEditor.form
@@ -100,7 +100,7 @@
                     </constraints>
                     <properties/>
                   </component>
-                  <grid id="9763" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                  <grid id="9763" binding="errorsPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                     <margin top="0" left="0" bottom="0" right="0"/>
                     <constraints>
                       <grid row="6" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>