From 6223a1b3c8573f6739938eca575e7a1d8978d471 Mon Sep 17 00:00:00 2001 From: Demis Bellot Date: Tue, 21 Jan 2020 01:47:03 -0500 Subject: [PATCH 001/143] Update build.gradle --- src/ServiceStackIDEA/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ServiceStackIDEA/build.gradle b/src/ServiceStackIDEA/build.gradle index 91f969e8..4fa05f67 100644 --- a/src/ServiceStackIDEA/build.gradle +++ b/src/ServiceStackIDEA/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.jetbrains.intellij" version "0.0.32" + id "org.jetbrains.intellij" version "0.4.15" } -version = '1.0.13' +version = '1.0.36' apply plugin: 'org.jetbrains.intellij' dependencies { From 2cc62fc98f8d19f8f62a17f04fdc3233da078f85 Mon Sep 17 00:00:00 2001 From: Darren Reid Date: Tue, 21 Jan 2020 17:54:44 +1100 Subject: [PATCH 002/143] Update build.gradle This is a total guess at changes required but looks like change to plugin public structure in build file too + need to pass token. --- src/ServiceStackIDEA/build.gradle | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ServiceStackIDEA/build.gradle b/src/ServiceStackIDEA/build.gradle index 4fa05f67..e070da32 100644 --- a/src/ServiceStackIDEA/build.gradle +++ b/src/ServiceStackIDEA/build.gradle @@ -15,6 +15,7 @@ if(System.env.BUILD_NUMBER != null && System.env.SERVICESTACKIDEA_PUBLISH_NIGHTL String jbUser; String jbPass; +String jbToken; if(properties.getProperty("jetbrains.plugins.user", null) == null) { @@ -22,6 +23,7 @@ if(properties.getProperty("jetbrains.plugins.user", null) == null) { } jbUser = properties.getProperty("jetbrains.plugins.user"); jbPass = properties.getProperty("jetbrains.plugins.password"); +jbToken = properties.getProperty("jetbrains.plugins.token"); intellij { version 'IC-14.1.4' @@ -29,10 +31,9 @@ intellij { pluginName 'ServiceStackIDEA' updateSinceUntilBuild false - publish { - username jbUser - password jbPass - pluginId '7749' - channel 'nightly' - } -} \ No newline at end of file + publishPlugin { + token jbToken + pluginId '7749' + channel 'nightly' + } +} From e7ddb8d3806e4713f321e1be78d1a28c2a10c081 Mon Sep 17 00:00:00 2001 From: Demis Bellot Date: Tue, 21 Jan 2020 02:05:28 -0500 Subject: [PATCH 003/143] Update gradle-wrapper.properties --- src/ServiceStackIDEA/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServiceStackIDEA/gradle/wrapper/gradle-wrapper.properties b/src/ServiceStackIDEA/gradle/wrapper/gradle-wrapper.properties index 1a45772f..ee69dd68 100644 --- a/src/ServiceStackIDEA/gradle/wrapper/gradle-wrapper.properties +++ b/src/ServiceStackIDEA/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 61ed0e9dd21f7e27620913144007de39f95c8b8d Mon Sep 17 00:00:00 2001 From: Demis Bellot Date: Tue, 21 Jan 2020 02:45:46 -0500 Subject: [PATCH 004/143] try without pluginId to resolve build error Could not find method pluginId() for arguments [7749] on task ':publishPlugin' --- src/ServiceStackIDEA/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ServiceStackIDEA/build.gradle b/src/ServiceStackIDEA/build.gradle index e070da32..b8ae38f5 100644 --- a/src/ServiceStackIDEA/build.gradle +++ b/src/ServiceStackIDEA/build.gradle @@ -33,7 +33,6 @@ intellij { publishPlugin { token jbToken - pluginId '7749' channel 'nightly' } } From b95579a8c3f8dbac7489ffe9008ea3d6f6afba74 Mon Sep 17 00:00:00 2001 From: Demis Bellot Date: Tue, 21 Jan 2020 02:47:51 -0500 Subject: [PATCH 005/143] channels may only be alpha, beta, eap https://www.jetbrains.org/intellij/sdk/docs/tutorials/build_system/deployment.html#specifying-a-release-channel --- src/ServiceStackIDEA/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServiceStackIDEA/build.gradle b/src/ServiceStackIDEA/build.gradle index b8ae38f5..b4a4f106 100644 --- a/src/ServiceStackIDEA/build.gradle +++ b/src/ServiceStackIDEA/build.gradle @@ -33,6 +33,6 @@ intellij { publishPlugin { token jbToken - channel 'nightly' + channel 'beta' } } From 0cdc11f40829fd5fe4bcbb29a1c4bbd276599f5d Mon Sep 17 00:00:00 2001 From: Demis Bellot Date: Tue, 21 Jan 2020 02:50:29 -0500 Subject: [PATCH 006/143] Update build.gradle --- src/ServiceStackIDEA/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServiceStackIDEA/build.gradle b/src/ServiceStackIDEA/build.gradle index b4a4f106..2c229530 100644 --- a/src/ServiceStackIDEA/build.gradle +++ b/src/ServiceStackIDEA/build.gradle @@ -33,6 +33,6 @@ intellij { publishPlugin { token jbToken - channel 'beta' + channels 'beta' } } From df9f0974908ee8fd74026a3a6928955aa253fdec Mon Sep 17 00:00:00 2001 From: Demis Bellot Date: Tue, 21 Jan 2020 22:03:53 -0500 Subject: [PATCH 007/143] bump client gradle to v5.4.1 and remove unused user/password vars --- .idea/codeStyles/Project.xml | 116 ++++++++++++++++++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- src/ServiceStackIDEA/build.gradle | 5 - 3 files changed, 117 insertions(+), 6 deletions(-) create mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..681f41ae --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/src/AndroidClient/client/gradle/wrapper/gradle-wrapper.properties b/src/AndroidClient/client/gradle/wrapper/gradle-wrapper.properties index f23df6e4..b6d1b478 100644 --- a/src/AndroidClient/client/gradle/wrapper/gradle-wrapper.properties +++ b/src/AndroidClient/client/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/src/ServiceStackIDEA/build.gradle b/src/ServiceStackIDEA/build.gradle index 2c229530..df0470cc 100644 --- a/src/ServiceStackIDEA/build.gradle +++ b/src/ServiceStackIDEA/build.gradle @@ -13,16 +13,11 @@ if(System.env.BUILD_NUMBER != null && System.env.SERVICESTACKIDEA_PUBLISH_NIGHTL version = "${version}.$System.env.BUILD_NUMBER" } -String jbUser; -String jbPass; String jbToken; - if(properties.getProperty("jetbrains.plugins.user", null) == null) { properties.load(project.file('./local.properties').newDataInputStream()) } -jbUser = properties.getProperty("jetbrains.plugins.user"); -jbPass = properties.getProperty("jetbrains.plugins.password"); jbToken = properties.getProperty("jetbrains.plugins.token"); intellij { From 134dea7930f62ca649f5200d9561de229cc983a1 Mon Sep 17 00:00:00 2001 From: Demis Bellot Date: Wed, 22 Jan 2020 02:19:28 -0500 Subject: [PATCH 008/143] fix warning --- .../java/net/servicestack/client/sse/ServerEventsClient.java | 2 +- .../java/net/servicestack/client/sse/ServerEventsClient.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java index ca57c030..1516ec0d 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java @@ -256,7 +256,7 @@ public void execute(ServerEventsClient client, ServerEventMessage msg) { if (args.length == 0){ if (target.equalsIgnoreCase(actionName)) { - mi.invoke(receiver, null); + mi.invoke(receiver); return; } continue; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/sse/ServerEventsClient.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/sse/ServerEventsClient.java index ca57c030..1516ec0d 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/sse/ServerEventsClient.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/sse/ServerEventsClient.java @@ -256,7 +256,7 @@ public void execute(ServerEventsClient client, ServerEventMessage msg) { if (args.length == 0){ if (target.equalsIgnoreCase(actionName)) { - mi.invoke(receiver, null); + mi.invoke(receiver); return; } continue; From 38eb891a7696bfe1678607072f32a8a0c80eddf0 Mon Sep 17 00:00:00 2001 From: Demis Bellot Date: Wed, 22 Jan 2020 02:19:39 -0500 Subject: [PATCH 009/143] Update TestServiceTests.java --- .../src/test/java/net/servicestack/client/TestServiceTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/TestServiceTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/TestServiceTests.java index f25e84e2..118554aa 100644 --- a/src/AndroidClient/client/src/test/java/net/servicestack/client/TestServiceTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/TestServiceTests.java @@ -223,7 +223,7 @@ public void test_Does_handle_ValidationException(){ assertEquals("Age", status.getErrors().get(0).getFieldName()); assertEquals("NotEmpty", status.getErrors().get(1).errorCode); - assertEquals("'Required' should not be empty.", status.getErrors().get(1).getMessage()); + assertEquals("'Required' must not be empty.", status.getErrors().get(1).getMessage()); assertEquals("Required", status.getErrors().get(1).getFieldName()); assertEquals("Email", status.getErrors().get(2).errorCode); From 332808456a55547a59d3c4bf84a6a59ea28517c6 Mon Sep 17 00:00:00 2001 From: Demis Bellot Date: Wed, 22 Jan 2020 02:19:47 -0500 Subject: [PATCH 010/143] update projs --- .idea/ServiceStack.Java.iml | 6 ++++-- .idea/misc.xml | 6 ++++++ .../.idea/caches/build_file_checksums.ser | Bin 845 -> 845 bytes src/AndroidClient/androidchat/androidchat.iml | 2 +- src/AndroidClient/app/app.iml | 12 +++++++----- src/AndroidClient/kotlin/kotlin.iml | 16 +++++++++------- src/AndroidClient/techstacks/techstacks.iml | 8 +++++--- .../techstackskotlin/techstackskotlin.iml | 8 +++++--- 8 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 .idea/misc.xml diff --git a/.idea/ServiceStack.Java.iml b/.idea/ServiceStack.Java.iml index d6ebd480..cb1905f3 100644 --- a/.idea/ServiceStack.Java.iml +++ b/.idea/ServiceStack.Java.iml @@ -2,8 +2,10 @@ - - + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..65b0364f --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/AndroidClient/.idea/caches/build_file_checksums.ser b/src/AndroidClient/.idea/caches/build_file_checksums.ser index c09f62b56628785d0f3b7fd531eb8dd3dcee8c86..f3389808986f7c140a817a624c3702aed9a526ea 100644 GIT binary patch delta 136 zcmV;30C)e*2F(VLm;}q+z)ItaN!wK`^%H3WNOebO0T6Wn*Y_bYWv_bCdA`9g|H0kr2!j qGi0*^t*-Cjsg_PK8W@xA0w54wMz8Kl-tk@s3{;LpXl2-w9s@7>JUyuZ diff --git a/src/AndroidClient/androidchat/androidchat.iml b/src/AndroidClient/androidchat/androidchat.iml index e845bb29..8325817f 100644 --- a/src/AndroidClient/androidchat/androidchat.iml +++ b/src/AndroidClient/androidchat/androidchat.iml @@ -19,7 +19,7 @@