Skip to content
This repository was archived by the owner on Apr 14, 2023. It is now read-only.

Commit

Permalink
Tidy gradle, gitignore and revert docker images
Browse files Browse the repository at this point in the history
  • Loading branch information
rstuart-scottlogic committed May 9, 2019
1 parent d28b0a2 commit f988dce
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 210 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:

build:
docker:
- image: circleci/openjdk:8-jdk
- image: circleci/openjdk:8-jdk-browsers
steps:
- checkout
# If changing build tools be sure to update GeneratorSetup.md in docs
Expand All @@ -27,7 +27,7 @@ jobs:

release:
docker:
- image: circleci/openjdk:8-jdk
- image: circleci/openjdk:8-jdk-browsers
steps:
- checkout
# If changing build tools be sure to update GeneratorSetup.md in docs
Expand Down
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ target/

# Ignore Gradle project-specific cache directory
.gradle/
build/generator/out/
schemas/out/
gradle/
generator/build/
generator/out/
schemas/build/
gradle/
schemas/out/
3 changes: 1 addition & 2 deletions generator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ task release(type: Jar) {
manifest {
attributes 'Created-By': 'Scott Logic',
'Implementation-Version': version != null ? version : "0.0",
'Built-By': System.properties['user.name'],
'Main-Class': 'com.scottlogic.deg.generator.App'
'Built-By': System.properties['user.name']
}

from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
Expand Down
203 changes: 0 additions & 203 deletions generator/pom.xml

This file was deleted.

0 comments on commit f988dce

Please sign in to comment.