From 382d51976643555efff4e2e50b6dbaf07072ab05 Mon Sep 17 00:00:00 2001 From: Anno van Vliet Date: Sun, 26 Feb 2017 18:13:10 +0100 Subject: [PATCH] Make Smack buildable under windows. Specify UTF-8 as character set. Added some symbolic links to smack-integration-test for consistency sake. --- build.gradle | 3 ++- .../smackx/filetransfer/package-info.java | 22 +------------------ .../jivesoftware/smackx/iot/package-info.java | 22 +------------------ .../smackx/iqversion/package-info.java | 22 +------------------ .../jivesoftware/smackx/muc/package-info.java | 22 +------------------ .../org/jivesoftware/smackx/package-info.java | 22 +------------------ .../smackx/ping/package-info.java | 22 +------------------ 7 files changed, 8 insertions(+), 127 deletions(-) mode change 100644 => 120000 smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java mode change 100644 => 120000 smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java mode change 100644 => 120000 smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java mode change 100644 => 120000 smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java mode change 100644 => 120000 smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java mode change 100644 => 120000 smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java diff --git a/build.gradle b/build.gradle index 5cfd4ad21..53915db64 100644 --- a/build.gradle +++ b/build.gradle @@ -118,7 +118,7 @@ allprojects { // Some systems may not have set their platform default // converter to 'utf8', but we use unicode in our source // files. Therefore ensure that javac uses unicode - options.encoding = "utf8" + options.encoding = 'UTF-8' options.compilerArgs = [ '-Xlint:all', // Set '-options' because a non-java7 javac will emit a @@ -164,6 +164,7 @@ allprojects { } tasks.withType(Javadoc) { options.charSet = "UTF-8" + options.encoding = 'UTF-8' } // Pin the errorprone version to prevent "unsupported major.minor diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java deleted file mode 100644 index 8d52af604..000000000 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * Copyright 2015 Florian Schmaus - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * TODO describe me. - */ -package org.jivesoftware.smackx.filetransfer; diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java new file mode 120000 index 000000000..538c3207c --- /dev/null +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java @@ -0,0 +1 @@ +../../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java \ No newline at end of file diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java deleted file mode 100644 index 6e800e994..000000000 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * Copyright 2015 Florian Schmaus - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * TODO describe me. - */ -package org.jivesoftware.smackx.iot; diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java new file mode 120000 index 000000000..3c51eae31 --- /dev/null +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java @@ -0,0 +1 @@ +../../../../../../../../smack-experimental/src/main/java/org/jivesoftware/smackx/iot/package-info.java \ No newline at end of file diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java deleted file mode 100644 index a864122f0..000000000 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * Copyright 2015 Florian Schmaus - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * TODO describe me. - */ -package org.jivesoftware.smackx.iqversion; diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java new file mode 120000 index 000000000..f1ac066f1 --- /dev/null +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java @@ -0,0 +1 @@ +../../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java \ No newline at end of file diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java deleted file mode 100644 index 0ecde2c27..000000000 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * Copyright 2015 Florian Schmaus - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * TODO describe me. - */ -package org.jivesoftware.smackx.muc; diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java new file mode 120000 index 000000000..d2e3650fc --- /dev/null +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java @@ -0,0 +1 @@ +../../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/muc/package-info.java \ No newline at end of file diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java deleted file mode 100644 index 01e4ee051..000000000 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * Copyright 2015 Florian Schmaus - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * TODO describe me. - */ -package org.jivesoftware.smackx; diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java new file mode 120000 index 000000000..f0646658f --- /dev/null +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java @@ -0,0 +1 @@ +../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java deleted file mode 100644 index 92e6a80e4..000000000 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * Copyright 2015 Florian Schmaus - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * TODO describe me. - */ -package org.jivesoftware.smackx.ping; diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java new file mode 120000 index 000000000..edea7d8fd --- /dev/null +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java @@ -0,0 +1 @@ +../../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/ping/package-info.java \ No newline at end of file