Skip to content

Commit

Permalink
Remove errorprone and proguard optimized version to be able to build …
Browse files Browse the repository at this point in the history
…with JDK11

Not yet JDK17 compatible
  • Loading branch information
patrickfav committed Feb 15, 2023
1 parent ff440e6 commit 8e39cc7
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 15 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Set up JDK 8
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'adopt'
java-version: '11'
distribution: 'temurin'
- name: Build with Maven
run: ./mvnw -B clean verify checkstyle:checkstyle jacoco:report -DcommonConfig.jarSign.skip=true
- name: Analyze with SonaQube
Expand Down Expand Up @@ -68,8 +68,8 @@ jobs:
- name: Set up Maven Central Repository
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'adopt'
java-version: '11'
distribution: 'temurin'
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
server-username: MAVEN_USERNAME # env variable for username in deploy
server-password: MAVEN_PASSWORD # env variable for token in deploy
Expand Down
2 changes: 1 addition & 1 deletion .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-DcommonConfig.compiler.profile=jdk7_w_errorprone
-DcommonConfig.compiler.profile=jdk7
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -700,8 +700,8 @@ the plugin versions as well as providing the checkstyle config rules. Specifical
## Tech Stack
* Java 7 (+ [errorprone](https://github.com/google/error-prone) static analyzer)
* Maven
* Java 7 Source, JDK 11 required to build (not yet JDK17 compatible)
* Maven 3
# Credits
Expand Down
10 changes: 3 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>at.favre.lib</groupId>
<artifactId>common-parent</artifactId>
<version>18</version>
<version>18.1</version>
</parent>

<artifactId>bytes</artifactId>
Expand All @@ -23,7 +23,7 @@
<inceptionYear>2017</inceptionYear>

<properties>
<commonConfig.jarSign.skip>false</commonConfig.jarSign.skip>
<commonConfig.jarSign.skip>true</commonConfig.jarSign.skip>
<!-- SonarQube Config -->
<sonar.organization>patrickfav</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand All @@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>4.2.0</version>
<version>5.1.8</version>
<extensions>true</extensions>
</plugin>
<plugin>
Expand Down Expand Up @@ -71,10 +71,6 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.github.wvengen</groupId>
<artifactId>proguard-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
Expand Down

0 comments on commit 8e39cc7

Please sign in to comment.