Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e7e95b8
Initial build w/ use of ServiceLoader for loading languages.
ZenHarbinger Sep 17, 2015
9849d3d
Removed BeanShell
ZenHarbinger Sep 17, 2015
c264520
Removed BeanShell
ZenHarbinger Sep 17, 2015
fc47c1c
Re-added the constant values in SyntaxConstants
ZenHarbinger Sep 17, 2015
1cfdbe5
Removed 'public' from interface methods.
ZenHarbinger Sep 17, 2015
f07cbe4
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Sep 19, 2015
7789d49
Changed version to 1.5
ZenHarbinger Sep 19, 2015
63c3164
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Sep 20, 2015
260b2c0
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Sep 21, 2015
7a62f48
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Oct 3, 2015
74d818c
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Oct 4, 2015
b468af7
Merge remote-tracking branch 'upstream/master'
ZenHarbinger May 16, 2016
9fb3db0
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Jun 5, 2016
d613332
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Jun 5, 2016
e5dbf22
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Jun 17, 2016
2198e29
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Jun 24, 2016
36584ba
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Jul 4, 2016
afd1c57
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Jul 9, 2016
98a8330
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Jul 9, 2016
6e2e205
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Jul 10, 2016
06719c8
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Aug 14, 2016
622c6b0
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Aug 20, 2016
dc449b3
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Aug 20, 2016
0bfa942
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Aug 21, 2016
580d53a
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Jan 11, 2017
9e1b800
Merge remote-tracking branch 'upstream/master'
ZenHarbinger Jan 11, 2017
f38fdfc
Added Yaml support to fork
ZenHarbinger Jan 11, 2017
4f9fdf2
Updatd pom.xml version.
ZenHarbinger Jan 11, 2017
2a0fce1
Removed .gitignore.orig which was a conflict file.
ZenHarbinger Jan 11, 2017
d40d7dc
Removed two confilict resolution files.
ZenHarbinger Jan 11, 2017
481fb17
Cleaned up Source for registration.
ZenHarbinger Jan 11, 2017
3ad037d
Added registration for Docker and Ini
ZenHarbinger Jan 11, 2017
e8cba40
Removed unused imports.
ZenHarbinger Jan 11, 2017
98aebb8
Updating to use circleci and codecov for ZenHarbinger
ZenHarbinger Jan 11, 2017
b012792
Fixed URL and Java Version in pom.xml
ZenHarbinger Jan 11, 2017
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ build
.gradle
/.settings/
.checkstyle

target/
19 changes: 19 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
machine:
java:
version: oraclejdk8
test:
override:
- mvn clean cobertura:cobertura
post:
- bash <(curl -s https://codecov.io/bash)
general:
branches:
ignore:
- gh-pages
#general:
# branches:
# only:
# - master # list of branches to build
# - java8
# - tests
# - /feature-.*/ # or regexes
28 changes: 28 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
codecov:
notify:
require_ci_to_pass: true
comment:
behavior: default
layout: header, diff
require_changes: false
coverage:
precision: 2
# range: "60...80"
round: down
status:
changes: false
patch: true
project: true
ignore:
#auto-generated files
- .*/antlr/.*
- .*/model/.*
parsers:
gcov:
branch_detection:
conditional: true
loop: true
macro: false
method: false
javascript:
enable_partials: false
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
12 changes: 6 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Jul 03 10:44:01 EDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
#Sat Jul 09 10:36:18 EDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
52 changes: 26 additions & 26 deletions gradlew

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

8 changes: 4 additions & 4 deletions gradlew.bat

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

199 changes: 199 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.tros</groupId>
<artifactId>rsyntaxtextarea</artifactId>
<version>2.6.0</version>
<packaging>jar</packaging>
<name>RSyntaxTextArea</name>
<url>https://bobbylight.github.io/RSyntaxTextArea/</url>
<description>A Logo interpreter written in Java.</description>
<developers>
<developer>
<id>bobbylight</id>
<name>Matthew Aguirre</name>
<url>https://github.com/bobbylight/</url>
<roles>
<role>architect</role>
<role>developer</role>
</roles>
</developer>
<developer>
<id>ZenHarbinger</id>
<name>Matthew Aguirre</name>
<email>matt.aguirre@gmail.com</email>
<url>https://github.com/ZenHarbinger/</url>
<organization>tros</organization>
<organizationUrl>http://tros.org/</organizationUrl>
<roles>
<role>developer</role>
</roles>
<timezone>America/New_York</timezone>
</developer>
</developers>
<licenses>
<license>
<name>modified BSD license</name>
<url>https://raw.githubusercontent.com/bobbylight/RSyntaxTextArea/master/src/main/dist/RSyntaxTextArea.License.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<issueManagement>
<system>Github</system>
<url>https://github.com/ZenHarbinger/RSyntaxTextArea/issues</url>
</issueManagement>
<scm>
<connection>scm:git:git://github.com/ZenHarbinger/RSyntaxTextArea</connection>
<developerConnection>scm:git:git@github.com/ZenHarbinger/RSyntaxTextArea</developerConnection>
<url>https://github.com/ZenHarbinger/RSyntaxTextArea</url>
</scm>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
</distributionManagement>
<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<configuration>
<formats>
<format>html</format>
<format>xml</format>
</formats>
<check/>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>eu.somatik.serviceloader-maven-plugin</groupId>
<artifactId>serviceloader-maven-plugin</artifactId>
<version>1.0.7</version>
<configuration>
<services>
<param>org.fife.ui.rsyntaxtextarea.TokenMakerRegistration</param>
</services>
</configuration>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
</properties>
</project>
Loading