Skip to content

Commit

Permalink
build: upgrade project dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
aoudiamoncef committed Aug 9, 2022
1 parent 253d0a5 commit f5ef72e
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 658 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- '**'
pull_request:
branches:
- main
- support/apollo-2

jobs:
build:
Expand All @@ -32,4 +32,4 @@ jobs:
restore-keys: ${{ runner.os }}-m2

- name: Build
run: ./mvnw --no-transfer-progress -B -U --file pom.xml install
run: mvn --no-transfer-progress -B -U --file pom.xml install
22 changes: 1 addition & 21 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,4 @@ jobs:
export GPG_TTY=$(tty)
git config user.name "${{ github.event.head_commit.committer.name }}"
git config user.email "${{ github.event.head_commit.committer.email }}"
./mvnw --no-transfer-progress -B --file pom.xml -Dmaven.site.skip=true -Drelease=true dependency:go-offline deploy
- name: Setup Java for JReleaser
uses: actions/setup-java@v1
with:
distribution: 'adopt'
java-version: 11

- name: Run JReleaser
uses: jreleaser/release-action@v1
env:
JRELEASER_PROJECT_VERSION: ${{ github.event.inputs.version }}
JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
JRELEASER_DOCKER_DEFAULT_PASSWORD: ${{ secrets.JRELEASER_DOCKER_PASSWORD }}
JRELEASER_TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_KEY }}
JRELEASER_TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_SECRET }}
JRELEASER_TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
JRELEASER_TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
mvn --no-transfer-progress -B --file pom.xml -Dmaven.site.skip=true -Drelease=true dependency:go-offline deploy
6 changes: 3 additions & 3 deletions .github/workflows/trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
branch:
description: "Branch to release from"
required: true
default: "main"
default: "support/apollo-2"
version:
description: "Release version"
required: true
Expand Down Expand Up @@ -34,7 +34,7 @@ jobs:
restore-keys: ${{ runner.os }}-m2

- name: Build
run: ./mvnw --no-transfer-progress -B -U --file pom.xml install
run: mvn --no-transfer-progress -B -U --file pom.xml install

tag:
name: Tag
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
VERSION=${{ github.event.inputs.version }}
echo "Releasing $VERSION from $BRANCH branch"
git checkout $BRANCH
./mvnw --no-transfer-progress -B versions:set versions:commit -DnewVersion=$VERSION
mvn --no-transfer-progress -B versions:set versions:commit -DnewVersion=$VERSION
git config --global user.email "[email protected]"
git config --global user.name "Automated release"
git commit -a -m "build: releasing version $VERSION"
Expand Down
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

Binary file removed .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
2 changes: 0 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties

This file was deleted.

2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai

== Attribution

This Code of Conduct is adapted from the http://contributor-covenant.org[Contributor Covenant], version 1.4, available at http://contributor-covenant.org/version/1/4/[http://contributor-covenant.org/version/1/4]
This Code of Conduct is adapted from the http://contributor-covenant.org[Contributor Covenant], version 1.4, available at http://contributor-covenant.org/version/1/4/[http://contributor-covenant.org/version/1/4]
6 changes: 3 additions & 3 deletions CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ TIP: Force using Linux EOF in your Windows machine repositories:

== WorkFlow

=== GithubFlow
=== GitlabFlow

See https://guides.github.com/introduction/flow/[GitlabFlow] documentation.
See https://docs.gitlab.com/ee/topics/gitlab_flow.html[GitlabFlow] documentation.

IMPORTANT: Create a new pull request on Github (only if Github don't find any conflict).

Expand All @@ -120,4 +120,4 @@ IMPORTANT: Create a new pull request on Github (only if Github don't find any co
[source,bash]
----
ktlint applyToIDEAProject
----
----
4 changes: 2 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:project-name: apollo-client-maven-plugin
:project-groupId: com.github.aoudiamoncef
:project-artifactId: apollo-client-maven-plugin-parent
:project-version: 4.0.5
:project-version: 4.0.6

image:https://github.com/{project-owner}/{project-name}/workflows/Build/badge.svg["Build Status", link="https://github.com/{project-owner}/{project-name}/actions"]
image:https://img.shields.io/maven-central/v/{project-groupId}/{project-artifactId}.svg[Download, link="https://search.maven.org/#search|ga|1|g:{project-groupId} AND a:{project-artifactId}"]
Expand All @@ -30,7 +30,7 @@ Maven plugin that calls the https://github.com/apollographql/apollo-android[Apol
<dependency>
<groupId>com.apollographql.apollo</groupId>
<artifactId>apollo-runtime</artifactId>
<version>2.5.10</version>
<version>2.5.12</version>
</dependency>
<!-- Optional, needed only for ANNOTATED nullable type-->
<dependency>
Expand Down
5 changes: 3 additions & 2 deletions apollo-client-maven-plugin-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.aoudiamoncef</groupId>
<artifactId>apollo-client-maven-plugin-parent</artifactId>
<version>v4.0.5</version>
<version>4.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -77,6 +77,7 @@
<plugin>
<groupId>com.github.aoudiamoncef</groupId>
<artifactId>apollo-client-maven-plugin</artifactId>
<version>4.0.6-SNAPSHOT</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -192,4 +193,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
2 changes: 1 addition & 1 deletion apollo-client-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.aoudiamoncef</groupId>
<artifactId>apollo-client-maven-plugin-parent</artifactId>
<version>v4.0.5</version>
<version>4.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Loading

0 comments on commit f5ef72e

Please sign in to comment.