Skip to content

Commit 9233fe3

Browse files
committed
Initial fix for Android studio, upgade IDEA plugin to require/target at least 2019.3 onwards.
1 parent 3799e9c commit 9233fe3

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

src/ServiceStackIDEA/ServiceStackIDEA.iml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id="ServiceStackIDEA" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" inherit-compiler-output="false">
2+
<module external.linked.project.id="ServiceStackIDEA" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="PLUGIN_MODULE" version="4">
3+
<component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/main/resources/META-INF/plugin.xml" />
4+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
45
<output url="file://$MODULE_DIR$/build/classes/main" />
56
<output-test url="file://$MODULE_DIR$/build/classes/test" />
67
<exclude-output />

src/ServiceStackIDEA/build.gradle

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
plugins {
2-
id "org.jetbrains.intellij" version "0.4.15"
2+
id "org.jetbrains.intellij" version "0.6.5"
3+
}
4+
version = '1.0.41'
5+
repositories {
6+
mavenCentral()
37
}
4-
version = '1.0.40'
5-
68
apply plugin: 'org.jetbrains.intellij'
79
dependencies {
810

911
}
10-
Properties properties = System.properties;
12+
Properties properties = System.properties
1113
if(System.env.BUILD_NUMBER != null && System.env.SERVICESTACKIDEA_PUBLISH_NIGHTLY != null) {
1214
// Append build number to version for a new nightly build version to be published.
1315
version = "${version}.$System.env.BUILD_NUMBER"
1416
}
1517

16-
String jbToken;
18+
String jbToken
1719

1820
if (properties.getProperty("jetbrains.plugins.user", null) == null) {
1921
properties.load(project.file('./local.properties').newDataInputStream())
2022
}
21-
jbToken = properties.getProperty("jetbrains.plugins.token");
23+
jbToken = properties.getProperty("jetbrains.plugins.token")
2224

2325
intellij {
24-
version 'IC-14.1.4'
25-
plugins 'maven'
26+
version '2019.2'
27+
plugins = ['maven','java']
2628
pluginName 'ServiceStackIDEA'
2729
updateSinceUntilBuild false
2830

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/PluginSettingsService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
import com.intellij.openapi.components.*;
44
import com.intellij.util.xmlb.XmlSerializerUtil;
5+
import org.jetbrains.annotations.NotNull;
56
import org.jetbrains.annotations.Nullable;
67

78
/**
89
* Created by Layoric on 27/05/2016.
910
*/
10-
@State(name = "PluginSettingsService", storages = @Storage(id = "default", file = StoragePathMacros.APP_CONFIG + "/servicestack-settings.xml"))
11+
@State(name = "PluginSettingsService", storages = @Storage("servicestack-settings.xml"))
1112
public class PluginSettingsService implements PersistentStateComponent<PluginSettingsService> {
1213
public Boolean optOutOfStats = false;
1314

@@ -18,7 +19,7 @@ public PluginSettingsService getState() {
1819
}
1920

2021
@Override
21-
public void loadState(PluginSettingsService pluginSettingsService) {
22+
public void loadState(@NotNull PluginSettingsService pluginSettingsService) {
2223
XmlSerializerUtil.copyBean(pluginSettingsService, this);
2324
}
2425

0 commit comments

Comments
 (0)