Skip to content

Commit

Permalink
Match v0.6 Release
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartmscott committed Jul 13, 2018
1 parent 8818a96 commit 56cba59
Show file tree
Hide file tree
Showing 109 changed files with 1,413 additions and 1,781 deletions.
19 changes: 14 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
*.class
.classpath
*.iml
.DS_Store
.classpath
.externalNativeBuild
.gradle
.project
.metadata
out
sample/out

#Removed so users can see how keystore and password are stored
#sample/private
sample/Echo/out
sample/HelloDroid/.idea/caches
sample/HelloDroid/.idea/libraries
sample/HelloDroid/.idea/modules.xml
sample/HelloDroid/.idea/workspace.xml
sample/HelloDroid/app/build
sample/HelloDroid/build
sample/HelloDroid/captures
sample/HelloDroid/local.properties
sample/HelloDroid/out

# Mobile Tools for Java (J2ME)
.mtj.tmp/
Expand Down
37 changes: 31 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ A lightweight, fast and extensible build system.

Match hides away the heavy lifting in Java, leaving the build files simple, intuitive, and easy to maintain.

# Add the library
# Add the libraries
Library(
name = "checkstyle"
file = "checkstyle-8.11-all.jar"
location = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-8.11/"
)

Library(
name = "junit"
file = "junit-4.12.jar"
Expand Down Expand Up @@ -40,23 +46,42 @@ Match hides away the heavy lifting in Java, leaving the build files simple, intu
main-class = "match.SampleTest"
)

# Release the package once tests pass
# Check the code style
CheckStyle(
name = "SampleCheckStyleResult"
config = "$HOME/match/checkstyle.xml"
source = [
Find("source")
Find("tests/source")
]
)

# Release the package once style is checked and tests pass
Release(
source = "Sample"
channel = "cp %s $HOME/match/libraries/Sample-0.5.jar"
await = "SampleTestResult"
require = [
"SampleCheckStyleResult"
"SampleTestResult"
]
)

## Running
- ./lite-em - builds all targets
- ./lite-em quiet - builds all targets quietly
- ./lite-em verbose - builds all targets verbosely

## Functions
- AndroidApk - builds an Android APK using the Android SDK.
- AndroidInstrumentation - installs and runs instrumentation tests on a connected Android device.
- CheckStyle - enforces a style guide on the source code.
- Find - finds all files under the given directory, filtering files by an optional pattern.
- Get - looks up a build property given a key.
- GetFile - gets a reference to a file created by another function.
- Gradle - triggers a Gradle build of the given tasks.
- JavaJar - compiles java code into a jar.
- JavaJUnit - runs JUnit tests.
- Library - adds a library to the build, downloading if necessary.
- Platform - picks an option based on the build platform.
- Protobuf - generates Java from Protocol Buffers and then packages the classes into a jar.
- Release - builds a release bundle, and pushes it out the distribution channels.
- Set - sets a build property given a key/value pair.
- SetFile - sets a file property and reference.
Expand All @@ -65,7 +90,7 @@ Match hides away the heavy lifting in Java, leaving the build files simple, intu
## Extensions
Match can easily be extended to include project-, language- or workspace-specific functions.

1. Create a new function in the "expression.function" package which extends "Function"
1. Create a new function in the "match.expression.function" package which extends "Function"
2. Compile and add to Match's classpath
3. Call by name in your match files

Expand Down
10 changes: 10 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
Match Release
=============

# v0.6
- Adds Platform for selecting options based on build platform
- Simplifies Library by using Platform
- Moves Protobuf support into its own function
- Ditches Android support for Gradle support
- Use match as a top level name for all packages
- Adds customizable target and total build time limits
- Adds verbose option
- Adds initial clean option - still work-in-progress

# v0.5
- Adds Android Library Support
- Adds CheckStyle Support
Expand Down
6 changes: 3 additions & 3 deletions lite-em
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

LIBRARIES="$HOME/match/libraries"
CONFIG_JAR="$LIBRARIES/Config-0.1.jar"
MATCH_JAR="$LIBRARIES/Match-0.5.jar"
MATCH_JAR="$LIBRARIES/Match-0.6.jar"

if [ ! -d "$LIBRARIES" ]; then
mkdir -p $LIBRARIES
Expand All @@ -26,7 +26,7 @@ if [ ! -f "$CONFIG_JAR" ]; then
fi

if [ ! -f "$MATCH_JAR" ]; then
curl -L https://github.com/stuartmscott/Match/releases/download/v0.5/Match-0.5.jar -o $MATCH_JAR
curl -L https://github.com/stuartmscott/Match/releases/download/v0.6/Match-0.6.jar -o $MATCH_JAR
fi

java -cp $CONFIG_JAR:$MATCH_JAR match.Match root=. libraries="$LIBRARIES"
java -cp $CONFIG_JAR:$MATCH_JAR match.Match root=. libraries="$LIBRARIES" $@
4 changes: 2 additions & 2 deletions match
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ JavaJUnit(

Release(
source = "Match"
channel = "cp %s $HOME/match/libraries/Match-0.5.jar"
await = [
channel = "cp %s $HOME/match/libraries/Match-0.6.jar"
require = [
"MatchCheckStyleResult"
"MatchTestResult"
]
Expand Down
Binary file not shown.
29 changes: 29 additions & 0 deletions sample/HelloDroid/.idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions sample/HelloDroid/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions sample/HelloDroid/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions sample/HelloDroid/.idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 0 additions & 36 deletions sample/HelloDroid/App/AndroidManifest.xml

This file was deleted.

23 changes: 0 additions & 23 deletions sample/HelloDroid/App/resource/values/strings.xml

This file was deleted.

49 changes: 0 additions & 49 deletions sample/HelloDroid/App/source/hello/droid/OtherActivity.java

This file was deleted.

24 changes: 0 additions & 24 deletions sample/HelloDroid/App/tests/instrumentation/AndroidManifest.xml

This file was deleted.

Loading

0 comments on commit 56cba59

Please sign in to comment.