Skip to content

Commit

Permalink
Merge pull request #36 from kagof/release/1.3.1
Browse files Browse the repository at this point in the history
Release/1.3.1
  • Loading branch information
kagof authored Dec 26, 2020
2 parents 0b4992c + a700884 commit 48d5c7e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 1.8
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build & deploy with Gradle
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,24 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 1.8
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew buildPlugin

- name: Verify against IntelliJ builds
id: verify
uses: ChrisCarini/[email protected].3
uses: ChrisCarini/[email protected].4
with:
ide-versions: |
ideaIC:2019.3.5
ideaIU:2019.3.5
ideaIC:2020.3
ideaIU:2020.3
ideaIC:LATEST-EAP-SNAPSHOT
ideaIU:LATEST-EAP-SNAPSHOT
- name: Sync master branch verification results to gist
id: sync
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

group = "com.kagof"
version = "1.3.0"
version = "1.3.1"

repositories {
mavenCentral()
Expand Down
5 changes: 5 additions & 0 deletions changenotes.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<ul>
<li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.3.1">1.3.1</a></b>
<ul>
<li>reverts Java version to 8 so plugin works with Android Studio</li>
</ul>
</li>
<li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.3.0">1.3.0</a></b>
<ul>
<li>new Gen II: Raikou, Entei, Suicune, Lugia, Ho-Oh, Celebi (thanks @marcodenisi)</li>
Expand Down

0 comments on commit 48d5c7e

Please sign in to comment.