Skip to content

Commit

Permalink
Merge branch 'master' into language-injection
Browse files Browse the repository at this point in the history
  • Loading branch information
PHPirates committed Apr 22, 2020
2 parents 0a52b28 + ab81cfa commit 3f26ada
Show file tree
Hide file tree
Showing 61 changed files with 1,764 additions and 424 deletions.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: TeXiFy IDEA wiki
url: https://github.com/Hannah-Sten/TeXiFy-IDEA/wiki/Features
about: List of features and documentation of TeXiFy IDEA.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ assignees: ''

---


<!-- Please check the wiki if your feature has already been implemented, to avoid duplicates: https://github.com/Hannah-Sten/TeXiFy-IDEA/wiki/Features -->
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ As an alternative, you can always [submit an issue with the label 'support'](htt
Unsure where to start?
Look for issues that are labeled [_good-first-issue_](https://github.com/Hannah-Sten/TeXiFy-IDEA/issues?q=is%3Aopen+is%3Aissue+label%3Agood-first-issue).
These issues should only require a small amount of work and are a good starting point.
Please comment on an issue when you are going to work on it, so we can assign you and avoid duplicate work.

If you have another issue or idea in mind, that's great too!
Be sure to run your idea by us (see [here](#i-just-have-a-question) how to do this).
This prevents your changes to be rejected in a later stage.


Have a look at the [README](README.md) to see how you can setup local development and build from source and the [helpful resources](#helpful-resources).

At any point, feel free to ask for help!
Expand Down
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
// Include the Gradle plugins which help building everything.
// Supersedes the use of 'buildscript' block and 'apply plugin:'
plugins {
id 'org.jetbrains.intellij' version '0.4.14'
id 'org.jetbrains.kotlin.jvm' version '1.3.61'
id 'org.jetbrains.intellij' version '0.4.18'
id 'org.jetbrains.kotlin.jvm' version '1.3.72'

// Plugin which can check for Gradle dependencies, use the help/dependencyUpdates task.
id 'com.github.ben-manes.versions' version '0.27.0'
id 'com.github.ben-manes.versions' version '0.28.0'

// Plugin which can update Gradle dependencies, use the help/useLatestVersions task.
id 'se.patrikerdes.use-latest-versions' version '0.2.13'

// Used to debug in a different IDE
id 'maven'
id 'de.undercouch.download' version '4.0.2'
id 'de.undercouch.download' version '4.0.4'

// Test coverage
id 'jacoco'
Expand Down Expand Up @@ -78,27 +78,27 @@ dependencies {
compile "org.slf4j:slf4j-simple:2.0.0-alpha1"

// Kotlin coroutines
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2" ) {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5-2-native-mt-1.4-M1" ) {
exclude(group: "org.jetbrains.kotlin")
}

// Test dependencies

// Also compile junit 4, just in case
testCompile("junit:junit:4.13-rc-2")
testRuntime("org.junit.vintage:junit-vintage-engine:5.6.0-M1")
testRuntime("org.junit.vintage:junit-vintage-engine:5.6.2")

// Use junit 5 for test cases
testCompile("org.junit.jupiter:junit-jupiter-api:5.6.0-M1")
testRuntime("org.junit.jupiter:junit-jupiter-engine:5.6.0-M1")
testCompile("org.junit.jupiter:junit-jupiter-api:5.6.2")
testRuntime("org.junit.jupiter:junit-jupiter-engine:5.6.2")

// Enable use of the JUnitPlatform Runner within the IDE
testCompile("org.junit.platform:junit-platform-runner:1.6.0")
testCompile("org.junit.platform:junit-platform-runner:1.6.2")

// just in case
testCompile "org.jetbrains.kotlin:kotlin-test"
testCompile "org.jetbrains.kotlin:kotlin-test-junit"
implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.61"
implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.72"

}

Expand Down
109 changes: 57 additions & 52 deletions gen/nl/hannahsten/texifyidea/grammar/BibtexLexer.java

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

Loading

0 comments on commit 3f26ada

Please sign in to comment.