Skip to content

Minimal set of changes for Java 8. #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Apr 11, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
0ff8cfb
Moved files to be suitable for Gradle project
mperry Nov 19, 2013
b7e6d52
FJ works with Gradle 1.8, Scala 2.9 and Java 7
mperry Nov 19, 2013
fe865b5
Upgraded Scala version used by Gradle to 2.10.3
mperry Nov 19, 2013
69e7929
Used Java 8 for compilation/test
mperry Nov 19, 2013
679f03d
Setup to run a demo class
mperry Nov 19, 2013
0416906
Got compiling under Intellij
mperry Nov 19, 2013
1535044
Cleanup of Intellij files under Java 8
mperry Nov 19, 2013
b5ffcf4
Converted F1 -> F8 from abstract classes to interfaces
mperry Nov 19, 2013
ee4c70d
Added first two Eueler problems in Java 8
mperry Nov 19, 2013
2dcbca8
Name and version FJ core artifact
mperry Nov 20, 2013
8ec4dcd
Set project org and version for local Maven/Gradle install
mperry Dec 11, 2013
706e828
Ignore .gradle and build dir
mperry Dec 11, 2013
3a67972
Removed unnecessary Gradle comments
mperry Dec 11, 2013
b7ce957
Removed .idea dir
mperry Dec 11, 2013
88aa19b
Removed Intellij files
mperry Dec 12, 2013
bf5e3e9
Basic scala module for testing
mperry Dec 12, 2013
4a7802f
Made tests module compile for scala, disabled scala in core module
mperry Dec 12, 2013
689901f
Moved scala tests out of core into tests
mperry Dec 12, 2013
6925318
Get functional java from local Maven repo
mperry Dec 12, 2013
41ed425
Removed settings.gradle from tests module
mperry Dec 12, 2013
9e99fd8
Ignore *.iml files
mperry Dec 12, 2013
673bd36
Removed Intellij iml file
mperry Dec 20, 2013
f88bbe1
Include tests module, fixed inter project dependency
mperry Feb 3, 2014
63ed488
Fixed self reference problem introduced since last early access relea…
mperry Apr 3, 2014
049364a
Workaround since Java 8 release does not work with Gradle for ScalaDo…
mperry Apr 3, 2014
a0e487b
Add group for FJ back to official group
mperry Apr 10, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ lib_managed
*.iws
.deps

.idea/ant.xml
.idea/workspace.xml
.idea

.gradle
build
*.iml


24 changes: 0 additions & 24 deletions .idea/compiler.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/encodings.xml

This file was deleted.

541 changes: 0 additions & 541 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/buildScala.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/libraries/defScala.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/scala_2_7_7.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/scala_2_7_7__build_.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/scala_2_8_1.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/libraries/scalacheck_1_8.xml

This file was deleted.

38 changes: 0 additions & 38 deletions .idea/misc.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/modules.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/scopes/scope_settings.xml

This file was deleted.

125 changes: 0 additions & 125 deletions .idea/uiDesigner.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/vcs.xml

This file was deleted.

18 changes: 18 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@

defaultTasks 'build'

ext {
}

allprojects {
ext {
fjVersion = "4.0-SNAPSHOT"
projectName = "functionaljava"
}
version = fjVersion
group = "org.functionaljava"
}

subprojects {

}
24 changes: 24 additions & 0 deletions core/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

apply plugin: 'java'
apply plugin: 'maven'

defaultTasks 'build'


jar {
baseName project.projectName
version project.fjVersion
manifest {
attributes 'Signature-Version': project.fjVersion
}
}

repositories {
mavenCentral()
}

dependencies {
compile 'org.slf4j:slf4j-api:1.7.5'

testCompile "junit:junit:4.11"
}
Loading