From d4993cea3f2925c06f784f5f869e0118fb30fb91 Mon Sep 17 00:00:00 2001 From: Pranav PANDEY Date: Mon, 21 Sep 2015 15:07:32 +0200 Subject: [PATCH] Preparation for demo with commented code. --- .gitattributes | 11 +++++++++++ .gitignore | 6 ++++++ build.gradle | 16 ++++++++++++++-- circle.yml | 16 ++++++++++++++++ src/main/java/hello/Greeter.java | 11 +++++++++++ 5 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 .gitattributes create mode 100644 .gitignore diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..20e30bc --- /dev/null +++ b/.gitattributes @@ -0,0 +1,11 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Declare files that will always have LF line endings on checkout. +*.java text eol=lf +*.scala text eol=lf +*.groovy text eol=lf +*.py text eol=lf +*.sh text eol=lf +*.bat text eol=crlf +*.prefs text eol=crlf \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ca87676 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.gradle/ +/bin/ +/build/ +.classpath +.project +.settings/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2e15fae..1cb8837 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,19 @@ -description = "Sample project to itnroduce Git, Gradle and CircleCI" +description = "Sample project to introduce Git, Gradle and CircleCI" task wrapper(type: Wrapper) { gradleVersion = '2.0' } -apply plugin: 'java' \ No newline at end of file +//apply plugin: 'java' +//apply plugin: 'eclipse' + +//repositories { mavenCentral() } + +//dependencies { +// compile([ +// 'commons-collections:commons-collections:3.2', +// 'joda-time:joda-time:2.6' +// ]) +// +// testCompile([ 'junit:junit:4.+']) +//} \ No newline at end of file diff --git a/circle.yml b/circle.yml index e69de29..44ccae5 100644 --- a/circle.yml +++ b/circle.yml @@ -0,0 +1,16 @@ +## Customize the test machine +#machine: +# java: +# version: oraclejdk7 + +## Customize dependencies +#dependencies: +# override: +# - ./gradlew compileTestJava + +# we automatically cache and restore many dependencies between +# builds. If you need to, you can add custom paths to cache: +# cache_directories: +# - "~/.gradle" +# - "build" + diff --git a/src/main/java/hello/Greeter.java b/src/main/java/hello/Greeter.java index ae10fd1..bdc0d8f 100644 --- a/src/main/java/hello/Greeter.java +++ b/src/main/java/hello/Greeter.java @@ -1,9 +1,20 @@ package hello; +//import org.joda.time.DateTime; + public class Greeter { +// private DateTime currentTime = new DateTime(); + public String sayHello() { return "Hello world!"; } + +/* + public DateTime getGreeterTime() { + + return this.currentTime; + } +*/ } \ No newline at end of file