Skip to content

Commit 8a4d035

Browse files
committed
Merge branch 'master' into fb_advanced_font_handling
# Conflicts: # .travis.yml # CHANGELOG # src/main/resources/META-INF/plugin.xml
2 parents 4556d92 + beb35df commit 8a4d035

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ env:
66
- IDEA_VERSION=IC-2017.3.1 GRAMMAR_KIT_VERSION=2017.1.2
77
- IDEA_VERSION=IC-2018.3.2 GRAMMAR_KIT_VERSION=2017.1.7
88
- IDEA_VERSION=IC-2019.1.3 GRAMMAR_KIT_VERSION=2017.1.7
9-
- IDEA_VERSION=PC-LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=07f30a1e7666f36ae780f614b6bbc89690ba36c3
9+
# - IDEA_VERSION=PC-LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=07f30a1e7666f36ae780f614b6bbc89690ba36c3
1010

1111
script: xvfb-run gradle check
1212

CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
NEW: improved font handling in table editor #122
55
FIX: proper font handling in balloon tooltips
66

7+
2.7.1
8+
Sep 26, 2019
9+
10+
Support for IDE v192.*
11+
712
2.7.0
813
Sep 16, 2019
914

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jacocoTestReport {
2424
}
2525

2626
group 'net.seesharpsoft.intellij.plugins'
27-
version pluginVersion
27+
version '2.7.1'
2828

2929
apply plugin: 'java'
3030
sourceCompatibility = javaVersion
@@ -71,7 +71,7 @@ idea {
7171
apply plugin: 'org.jetbrains.intellij'
7272
intellij {
7373
// IDE version - https://www.jetbrains.com/intellij-repository/releases
74-
version = System.getenv().getOrDefault('IDEA_VERSION', 'IC-191.5701.16')
74+
version = System.getenv().getOrDefault('IDEA_VERSION', 'IC-192.6817.14')
7575
pluginName = 'CSV Plugin'
7676
instrumentCode = true
7777
updateSinceUntilBuild = false

gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@
33
# https://www.jetbrains.com/intellij-repository/snapshots
44

55
name='CSV Plugin'
6-
pluginVersion=2.7.0
76
javaVersion=1.8
87
javaTargetVersion=1.8
9-
downloadIntellijSources=false

0 commit comments

Comments
 (0)