diff options
author | Jose <jose@zeroc.com> | 2018-09-14 11:30:20 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2018-09-14 11:30:20 +0200 |
commit | e2a5f1886499844c7f3c119de7f99868b95ca64b (patch) | |
tree | 7fbc37e2979ff5fb5b70b7ad04d43032bdb103d8 | |
parent | Fix bogus assert in Java Compat generator (diff) | |
download | ice-e2a5f1886499844c7f3c119de7f99868b95ca64b.tar.bz2 ice-e2a5f1886499844c7f3c119de7f99868b95ca64b.tar.xz ice-e2a5f1886499844c7f3c119de7f99868b95ca64b.zip |
Whitespace cleanup
-rw-r--r-- | cpp/test/Ice/objects/TestI.cpp | 1 | ||||
-rw-r--r-- | java-compat/.gitignore | 2 | ||||
-rw-r--r-- | java-compat/README.md | 6 | ||||
-rw-r--r-- | java-compat/settings.gradle | 1 | ||||
-rw-r--r-- | java/.gitignore | 2 | ||||
-rw-r--r-- | java/README.md | 7 |
6 files changed, 8 insertions, 11 deletions
diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp index 7ee2703aa79..328238a0fe7 100644 --- a/cpp/test/Ice/objects/TestI.cpp +++ b/cpp/test/Ice/objects/TestI.cpp @@ -329,7 +329,6 @@ InitialI::getH(const Ice::Current&) } #endif - KPtr InitialI::getK(const Ice::Current&) { diff --git a/java-compat/.gitignore b/java-compat/.gitignore index 4aa7a266b6d..3f606033662 100644 --- a/java-compat/.gitignore +++ b/java-compat/.gitignore @@ -4,4 +4,4 @@ build *.iml *.dex .idea -local.properties
\ No newline at end of file +local.properties diff --git a/java-compat/README.md b/java-compat/README.md index ae0689318cc..19e73c03a44 100644 --- a/java-compat/README.md +++ b/java-compat/README.md @@ -39,8 +39,8 @@ Make sure that the `javac` and `java` commands are present in your PATH. ### Gradle Ice for Java uses the [Gradle][3] build system, and includes the Gradle wrapper -in the distribution. You cannot build the Ice for Java source distribution without -an Internet connection. Gradle will download all required packages automatically +in the distribution. You cannot build the Ice for Java source distribution without +an Internet connection. Gradle will download all required packages automatically from Maven Central repository located at http://central.maven.org/maven2/ ### Bzip2 Compression @@ -184,7 +184,7 @@ Ice requires at minimum API level 21: - Android 5 (API21) If you want to target a later version of the Android API level for the test -suite, edit `test/android/controller/gradle.properties` and change the +suite, edit `test/android/controller/gradle.properties` and change the following variables: ``` diff --git a/java-compat/settings.gradle b/java-compat/settings.gradle index 954c6326350..c84ff0a2542 100644 --- a/java-compat/settings.gradle +++ b/java-compat/settings.gradle @@ -37,4 +37,3 @@ if(org.gradle.internal.jvm.Jvm.current().getJavaVersion().toString().toFloat() > include ':testLambda' project(':testLambda').projectDir = new File('test/lambda') } - diff --git a/java/.gitignore b/java/.gitignore index a2b356f9e1b..f7d655bc217 100644 --- a/java/.gitignore +++ b/java/.gitignore @@ -3,4 +3,4 @@ build .gradle *.iml .idea -local.properties
\ No newline at end of file +local.properties diff --git a/java/README.md b/java/README.md index 3ebfde30437..a09619e5a6c 100644 --- a/java/README.md +++ b/java/README.md @@ -49,8 +49,8 @@ JavaFX support, as the Metrics Graph feature is enabled dynamically. ### Gradle Ice for Java uses the [Gradle][3] build system, and includes the Gradle wrapper -in the distribution. You cannot build the Ice for Java source distribution without -an Internet connection. Gradle will download all required packages automatically +in the distribution. You cannot build the Ice for Java source distribution without +an Internet connection. Gradle will download all required packages automatically from Maven Central repository located at http://central.maven.org/maven2/ ### Bzip2 Compression @@ -143,7 +143,6 @@ values for `CPP_CONFIGURATION` are `Debug` and `Release`. Before building Ice for Java, review the settings in the file `gradle.properties` and edit as necessary. - To build Ice, all services, and tests, run ``` gradlew build @@ -212,7 +211,7 @@ failure, the tests abort with `failed`. ## Building the Ice for Android Tests -The `test/android/controller` directory contains an Android Studio project for +The `test/android/controller` directory contains an Android Studio project for the Ice test suite controller. ### Android Build Requirements |