Release 3.0

devexperts · Mar 16, 2020 · 60f9ca5 · 60f9ca5
1 parent 5e41581
commit 60f9ca5
Show file tree

Hide file tree

Showing 52 changed files with 425 additions and 94 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 
 # CHANGELOG
 
+## 3.0 - 2020-03-16
+
+- NEW: Gradle incremental processing support
+- NEW: Append mode removed in favor of merging properties. 
+
 ## 2.2 - 2019-12-27
 
 - FIX: Add support of IDEA 2019.1.2 to IDEA plugin

diff --git a/NOTICE b/NOTICE
@@ -1,6 +1,6 @@
 UI Localizer - a simple annotation processor that makes marked strings to be initialized by values from a localization file.
 
-Copyright (C) 2015 - 2019 Devexperts, LLC
+Copyright (C) 2015 - 2020 Devexperts, LLC
 
 This product is developed at Devexperts LLC (http://devexperts.com/).
 Licensed under the Mozilla Public License, Version 2.

diff --git a/README.md b/README.md
@@ -67,8 +67,7 @@ You can choose the current language in your application using java property `ui.
 
 UI Localizer tool is fail-safe. That means if anything of mentioned above is missing (java property, key in a file for concrete language or a file for the language itself), default string value from initial source code will be used.
 
-If you use UI Localizer for compilation multiple modules and you use the same property file name you should use the option `com.devexperts.uilocalizer.appendToPropertyFile` set to `true`, properties will be appended to the end of the file, e.g.: `-Acom.devexperts.uilocalizer.appendToPropertyFile=true`. The default value is `false`.
-Use this option with caution, don't forget to clean up all template files before compilation with UI Localizer.
+If you use UI Localizer with Gradle incremental compilation (or using the same property file for multiple modules), properties from each processing phase will be merged with previously existed in the file; new properties will replace old ones. Old properties that do not have a corresponding mention in the code will remain in place, so clean up all template files before compilation with UI Localizer to avoid stale options.
 
 You can define a folder where output files could be found. Use the option `com.devexperts.uilocalizer.outputFolder` set to path to a folder, e.g. `-Acom.devexperts.uilocalizer.outputFolder=C:\project\build`.
 The folder would be created by the UI Localizer if it is absent.

diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 }
 
 plugins {
-    id "com.github.hierynomus.license" version "0.14.0"
+    id "com.github.hierynomus.license" version "0.15.0"
     id 'net.researchgate.release' version '2.6.0'
 }
 
@@ -69,7 +69,7 @@ allprojects {
     beforeReleaseBuild.dependsOn publishToMavenLocal
 }
 
-subprojects {
+configure(subprojects){
     apply plugin: 'license'
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
@@ -161,7 +161,7 @@ subprojects {
     }
 
     repositories {
-        maven { url "http://dl.bintray.com/devexperts/Maven" }
-        maven { url "http://repo.maven.apache.org/maven2" }
+        maven { url "https://dl.bintray.com/devexperts/Maven" }
+        maven { url "https://repo.maven.apache.org/maven2" }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.2
+version=3.0
 inceptionYear=2015
 organization=Devexperts, LLC
 junitVersion=4.12
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,5 @@
 rootProject.name = 'UILocalizer'
 include ':uilocalizer-api'
 include ':uilocalizer-processor'
-include ':uilocalizer-idea-plugin'
+include ':uilocalizer-idea-plugin'
+include ':uilocalizer-processor-functionaltest'
diff --git a/uilocalizer-api/src/main/java/com/devexperts/uilocalizer/Localizable.java b/uilocalizer-api/src/main/java/com/devexperts/uilocalizer/Localizable.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-api/src/main/java/com/devexperts/uilocalizer/LocalizationProperty.java b/uilocalizer-api/src/main/java/com/devexperts/uilocalizer/LocalizationProperty.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-idea-plugin/src/main/java/com/devexperts/uilocalizer/LocalizationUtils.java b/uilocalizer-idea-plugin/src/main/java/com/devexperts/uilocalizer/LocalizationUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...calizer-idea-plugin/src/main/java/com/devexperts/uilocalizer/MarkLocalizableQuickFix.java b/...calizer-idea-plugin/src/main/java/com/devexperts/uilocalizer/MarkLocalizableQuickFix.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...er-idea-plugin/src/main/java/com/devexperts/uilocalizer/StringLocalizationInspection.java b/...er-idea-plugin/src/main/java/com/devexperts/uilocalizer/StringLocalizationInspection.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...dea-plugin/src/test/java/com/devexperts/uilocalizer/StringLocalizationInspectionTest.java b/...dea-plugin/src/test/java/com/devexperts/uilocalizer/StringLocalizationInspectionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-idea-plugin/src/test/testData/stringLocalization/annotationArgument/src/Foo.java b/uilocalizer-idea-plugin/src/test/testData/stringLocalization/annotationArgument/src/Foo.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...gin/src/test/testData/stringLocalization/anonymousClassConstructorParameter/src/Test.java b/...gin/src/test/testData/stringLocalization/anonymousClassConstructorParameter/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...plugin/src/test/testData/stringLocalization/constructorCallOfNonNlsVariable/src/Test.java b/...plugin/src/test/testData/stringLocalization/constructorCallOfNonNlsVariable/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/.../test/testData/stringLocalization/constructorCallUnderLocalizableAnnotation/src/Test.java b/.../test/testData/stringLocalization/constructorCallUnderLocalizableAnnotation/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-idea-plugin/src/test/testData/stringLocalization/enum/src/Test.java b/uilocalizer-idea-plugin/src/test/testData/stringLocalization/enum/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-idea-plugin/src/test/testData/stringLocalization/fields/src/Test.java b/uilocalizer-idea-plugin/src/test/testData/stringLocalization/fields/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...lugin/src/test/testData/stringLocalization/hardCodedStringLiteralAsParameter/src/Foo.java b/...lugin/src/test/testData/stringLocalization/hardCodedStringLiteralAsParameter/src/Foo.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...dea-plugin/src/test/testData/stringLocalization/initializerInAnonymousClass/src/Test.java b/...dea-plugin/src/test/testData/stringLocalization/initializerInAnonymousClass/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-idea-plugin/src/test/testData/stringLocalization/localVariables/src/Test.java b/uilocalizer-idea-plugin/src/test/testData/stringLocalization/localVariables/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-idea-plugin/src/test/testData/stringLocalization/nonNlsArray/src/Test.java b/uilocalizer-idea-plugin/src/test/testData/stringLocalization/nonNlsArray/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-idea-plugin/src/test/testData/stringLocalization/nonNlsClass/src/Foo.java b/uilocalizer-idea-plugin/src/test/testData/stringLocalization/nonNlsClass/src/Foo.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...ea-plugin/src/test/testData/stringLocalization/nonNlsClassWithAnonymousClass/src/Foo.java b/...ea-plugin/src/test/testData/stringLocalization/nonNlsClassWithAnonymousClass/src/Foo.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...lizer-idea-plugin/src/test/testData/stringLocalization/nonNlsClassWithLambda/src/Foo.java b/...lizer-idea-plugin/src/test/testData/stringLocalization/nonNlsClassWithLambda/src/Foo.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-idea-plugin/src/test/testData/stringLocalization/nonNlsComment/src/Foo.java b/uilocalizer-idea-plugin/src/test/testData/stringLocalization/nonNlsComment/src/Foo.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-idea-plugin/src/test/testData/stringLocalization/nonNlsInnerClass/src/Foo.java b/uilocalizer-idea-plugin/src/test/testData/stringLocalization/nonNlsInnerClass/src/Foo.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-idea-plugin/src/test/testData/stringLocalization/nonNlsMethod/src/Foo.java b/uilocalizer-idea-plugin/src/test/testData/stringLocalization/nonNlsMethod/src/Foo.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...alizer-idea-plugin/src/test/testData/stringLocalization/nonNlsWithInnerClass/src/Foo.java b/...alizer-idea-plugin/src/test/testData/stringLocalization/nonNlsWithInnerClass/src/Foo.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...ea-plugin/src/test/testData/stringLocalization/parameterInNewAnonymousClass/src/Test.java b/...ea-plugin/src/test/testData/stringLocalization/parameterInNewAnonymousClass/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...test/testData/stringLocalization/parameterInheritsNonNlsAnnotationFromSuper/src/Test.java b/...test/testData/stringLocalization/parameterInheritsNonNlsAnnotationFromSuper/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...lizer-idea-plugin/src/test/testData/stringLocalization/recursiveInheritance/src/Test.java b/...lizer-idea-plugin/src/test/testData/stringLocalization/recursiveInheritance/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...st/testData/stringLocalization/returnTypeInheritsNonNlsAnnotationFromParent/src/Test.java b/...st/testData/stringLocalization/returnTypeInheritsNonNlsAnnotationFromParent/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-idea-plugin/src/test/testData/stringLocalization/stringBufferNonNls/src/Bar.java b/uilocalizer-idea-plugin/src/test/testData/stringLocalization/stringBufferNonNls/src/Bar.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...lizer-idea-plugin/src/test/testData/stringLocalization/switchOnNonNlsString/src/Test.java b/...lizer-idea-plugin/src/test/testData/stringLocalization/switchOnNonNlsString/src/Test.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...lizer-idea-plugin/src/test/testData/stringLocalization/varargNonNlsParameter/src/Foo.java b/...lizer-idea-plugin/src/test/testData/stringLocalization/varargNonNlsParameter/src/Foo.java
@@ -2,7 +2,7 @@
  * #%L
  * UI Localizer
  * %%
- * Copyright (C) 2015 - 2019 Devexperts, LLC
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
  * %%
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/uilocalizer-processor-functionaltest/build.gradle b/uilocalizer-processor-functionaltest/build.gradle
@@ -0,0 +1,20 @@
+
+dependencies {
+    annotationProcessor project(":uilocalizer-processor")
+    implementation project(":uilocalizer-api")
+    testImplementation 'junit:junit:4.12'
+    compileOnly project(":uilocalizer-processor")
+}
+
+ext.localizationMethod = 'Lang.getString_u'
+compileJava {
+    options.compilerArgs += [
+        "-Acom.devexperts.uilocalizer.localizationMethod=${localizationMethod}",
+        "-Acom.devexperts.uilocalizer.outputFolder=${project.buildDir}/localizationTool",
+        "-Acom.devexperts.uilocalizer.requireBundleName=test"
+    ]
+}
+
+test {
+    useJUnit()
+}
diff --git a/...essor-functionaltest/src/main/java/com/devexperts/uilocalizer/funtest/ButtonConsumer.java b/...essor-functionaltest/src/main/java/com/devexperts/uilocalizer/funtest/ButtonConsumer.java
@@ -0,0 +1,19 @@
+/*
+ * #%L
+ * UI Localizer
+ * %%
+ * Copyright (C) 2015 - 2020 Devexperts, LLC
+ * %%
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * #L%
+ */
+
+package com.devexperts.uilocalizer.funtest;
+
+public class ButtonConsumer {
+    public static String getOkText() {
+        return ButtonsTwo.OKAY;
+    }
+}