Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 6 additions & 26 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.41</version>
<version>4.51</version>
<relativePath />
</parent>
<artifactId>xcode-plugin</artifactId>
Expand All @@ -44,28 +44,6 @@
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>rayhilton</id>
<name>Ray Yamamoto Hilton</name>
<email>ray.hilton@gmail.com</email>
</developer>
<developer>
<id>aheritier</id>
<name>Arnaud Heritier</name>
<email>aheritier@apache.org</email>
</developer>
<developer>
<id>lacostej</id>
<name>Jerome Lacoste</name>
<email>jerome.lacoste@gmail.com</email>
</developer>
<developer>
<id>kazuhidet</id>
<name>Kazuhide Takahashi</name>
<email>kazuhide.t@linux-powered.com</email>
</developer>
</developers>
<scm>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
Expand All @@ -88,8 +66,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.319.x</artifactId>
<version>1466.v85a_616ea_b_87c </version>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>1763.v092b_8980a_f5e </version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -146,7 +124,9 @@
<revision>2.0.17</revision>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/xcode-plugin</gitHubRepo>
<jenkins.version>2.319.1</jenkins.version>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.346</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
</properties>
<build>
<plugins>
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/au/com/rayh/BuildConfiguration.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
package au.com.rayh;

import com.dd.plist.NSDictionary;
import com.dd.plist.NSArray;
import com.dd.plist.NSNumber;
import com.dd.plist.NSObject;
import com.dd.plist.NSString;
import com.dd.plist.PropertyListFormatException;
import com.dd.plist.PropertyListParser;

public class BuildConfiguration {
public String uuid;
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/au/com/rayh/DeveloperProfileLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
import hudson.util.FormValidation;
import hudson.util.ListBoxModel;
import hudson.util.Secret;
import jenkins.model.Jenkins;
import jenkins.security.MasterToSlaveCallable;
import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException;
import org.jenkinsci.plugins.tokenmacro.TokenMacro;

import jenkins.tasks.SimpleBuildStep;
import org.jenkinsci.Symbol;
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/au/com/rayh/ExportIpa.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
package au.com.rayh;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.*;
import hudson.model.*;
import hudson.EnvVars;
import hudson.Extension;
import hudson.FilePath;
import hudson.Launcher;
import hudson.model.AbstractProject;
import hudson.model.Run;
import hudson.model.TaskListener;
import hudson.tasks.BuildStepDescriptor;
import hudson.tasks.Builder;
import hudson.util.ArgumentListBuilder;
import hudson.util.FormValidation;
import hudson.util.Secret;
import jenkins.tasks.SimpleBuildStep;
Expand All @@ -21,10 +25,7 @@
import edu.umd.cs.findbugs.annotations.CheckForNull;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

public class ExportIpa extends Builder implements SimpleBuildStep {
private static final String[] VALID_IPA_EXPORT_METHODS = { "development", "ad-hoc", "enterprise", "app-store" };
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/au/com/rayh/JenkinsXCodeBuildOutputParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.GregorianCalendar;

import org.apache.commons.lang.StringUtils;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/au/com/rayh/Keychain.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package au.com.rayh;

import hudson.util.Secret;
import org.apache.commons.lang.StringUtils;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/au/com/rayh/KeychainPasswordAndPath.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
import hudson.Util;
import hudson.util.Secret;

import java.io.IOException;

/**
* Credentials that have an ID, description and macOS Keychain password and path.
*
Expand Down
1 change: 0 additions & 1 deletion src/main/java/au/com/rayh/KeychainPasswordAndPathImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
*/
package au.com.rayh;

import com.cloudbees.plugins.credentials.CredentialsDescriptor;
import com.cloudbees.plugins.credentials.CredentialsProvider;
import com.cloudbees.plugins.credentials.domains.DomainRequirement;
import edu.umd.cs.findbugs.annotations.CheckForNull;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/au/com/rayh/KeychainUnlockStep.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;
import org.kohsuke.stapler.QueryParameter;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;

import edu.umd.cs.findbugs.annotations.NonNull;
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/au/com/rayh/XcodeProjectParser.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
package au.com.rayh;

import java.io.File;
import java.io.IOException;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.HashMap;
import java.text.ParseException;
import java.io.ByteArrayInputStream;
import hudson.FilePath;

import javax.xml.parsers.DocumentBuilder;
Expand All @@ -27,9 +21,7 @@

import com.dd.plist.NSDictionary;
import com.dd.plist.NSArray;
import com.dd.plist.NSNumber;
import com.dd.plist.NSObject;
import com.dd.plist.NSString;
import com.dd.plist.PropertyListFormatException;
import com.dd.plist.PropertyListParser;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/au/com/rayh/XcodeTestSummariesParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import javax.xml.bind.Marshaller;

import au.com.rayh.report.TestCase;
import au.com.rayh.report.TestError;
import au.com.rayh.report.TestFailure;
import au.com.rayh.report.TestSuite;

Expand Down
6 changes: 0 additions & 6 deletions src/main/java/hudson/plugins/xcode/XcodeInstallation.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import hudson.EnvVars;
import hudson.Extension;
import hudson.init.Initializer;
import hudson.model.EnvironmentSpecific;
import hudson.model.Node;
import hudson.model.TaskListener;
Expand All @@ -20,13 +19,8 @@

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.logging.Logger;

import static hudson.init.InitMilestone.EXTENSIONS_AUGMENTED;
import java.util.logging.Level;

/**
* Information about Xcode installation.
Expand Down Expand Up @@ -74,7 +68,7 @@
XcodeInstallation[] installations = null;
try {
installations = descriptor.getInstallations();
} catch (NullPointerException e) {

Check warning on line 71 in src/main/java/hudson/plugins/xcode/XcodeInstallation.java

View check run for this annotation

ci.jenkins.io / SpotBugs

DCN_NULLPOINTER_EXCEPTION

NORMAL: Do not catch NullPointerException like in hudson.plugins.xcode.XcodeInstallation.getInstallations(XcodeInstallation$DescriptorImpl)
Raw output
no message found
installations = new XcodeInstallation[0];
}
return installations;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/au/com/rayh/XCodeBuilderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

import java.util.Collections;

import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static java.util.Arrays.asList;


Expand Down
1 change: 0 additions & 1 deletion src/test/java/au/com/rayh/XcodeProjectParserTest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package au.com.rayh;

import org.junit.Assert;
import org.apache.commons.io.FileUtils;
import org.junit.Test;
import java.util.HashMap;
import java.util.List;
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/au/com/rayh/XcodeTestSummariesParserTest.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package au.com.rayh;

import org.junit.Assert;
import org.apache.commons.io.FileUtils;
import org.junit.Test;
import java.util.HashMap;
import java.util.List;
import java.io.File;
import java.io.IOException;
import java.net.URLDecoder;
Expand Down
Loading