Skip to content

Commit 0253ca0

Browse files
authoredNov 15, 2022
Merge pull request #5 from Moesif/refactor-update-okhttp-version
Refactor: Bump moesifapi version to 1.6.17
2 parents bc187e8 + b3ed3e0 commit 0253ca0

File tree

4 files changed

+72
-5
lines changed

4 files changed

+72
-5
lines changed
 

‎.devcontainer/Dockerfile

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.231.5/containers/java/.devcontainer/base.Dockerfile
2+
3+
# [Choice] Java version (use -bullseye variants on local arm64/Apple Silicon): 11, 17, 11-bullseye, 17-bullseye, 11-buster, 17-buster
4+
ARG VARIANT="17-bullseye"
5+
FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}
6+
7+
# [Option] Install Maven
8+
ARG INSTALL_MAVEN="false"
9+
ARG MAVEN_VERSION=""
10+
# [Option] Install Gradle
11+
ARG INSTALL_GRADLE="false"
12+
ARG GRADLE_VERSION=""
13+
RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
14+
&& if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
15+
16+
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
17+
ARG NODE_VERSION="none"
18+
RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
19+
20+
# [Optional] Uncomment this section to install additional OS packages.
21+
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
22+
# && apt-get -y install --no-install-recommends <your-package-list-here>
23+
24+
# [Optional] Uncomment this line to install global node packages.
25+
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
26+
27+
ENV JAVA_HOME=/docker-java-home

‎.devcontainer/devcontainer.json

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2+
// https://github.com/microsoft/vscode-dev-containers/tree/v0.231.5/containers/java
3+
{
4+
"name": "Java",
5+
"build": {
6+
"dockerfile": "Dockerfile",
7+
"args": {
8+
// Update the VARIANT arg to pick a Java version: 11, 17
9+
// Append -bullseye or -buster to pin to an OS version.
10+
// Use the -bullseye variants on local arm64/Apple Silicon.
11+
"VARIANT": "11-bullseye",
12+
// Options
13+
"INSTALL_MAVEN": "true",
14+
"INSTALL_GRADLE": "false",
15+
"NODE_VERSION": "lts/*"
16+
}
17+
},
18+
19+
// Set *default* container specific settings.json values on container create.
20+
"settings": {
21+
"java.jdt.ls.java.home": "/docker-java-home"
22+
},
23+
24+
// Add the IDs of extensions you want installed when the container is created.
25+
"extensions": [
26+
"vscjava.vscode-java-pack"
27+
],
28+
29+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
30+
// "forwardPorts": [],
31+
32+
// Use 'postCreateCommand' to run commands after the container is created.
33+
// "postCreateCommand": "java -version",
34+
35+
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
36+
"remoteUser": "vscode",
37+
"features": {
38+
"git": "os-provided"
39+
}
40+
}

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ For Maven users, add dependency to your `pom.xml`:
2424
<dependency>
2525
<groupId>com.moesif</groupId>
2626
<artifactId>moesif-okhttp-interceptor</artifactId>
27-
<version>1.0.4</version>
27+
<version>1.0.5</version>
2828
</dependency>
2929
```
3030
For Gradle users, add to your project's build.gradle file:
3131

3232
```gradle
3333
repositories {
3434
dependencies {
35-
implementation 'com.moesif:moesif-okhttp-interceptor:1.0.4'
35+
implementation 'com.moesif:moesif-okhttp-interceptor:1.0.5'
3636
}
3737
```
3838

‎pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.moesif</groupId>
88
<artifactId>moesif-okhttp-interceptor</artifactId>
9-
<version>1.0.4</version>
9+
<version>1.0.5</version>
1010
<packaging>jar</packaging>
1111
<name>moesif-okhttp-interceptor</name>
1212
<url>https://www.moesif.com</url>
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>com.moesif.api</groupId>
4646
<artifactId>moesifapi</artifactId>
47-
<version>1.6.13</version>
47+
<version>1.6.17</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>com.fasterxml.jackson.core</groupId>
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>com.squareup.okhttp3</groupId>
5656
<artifactId>okhttp</artifactId>
57-
<version>4.9.0</version>
57+
<version>4.10.0</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>ch.qos.logback</groupId>

0 commit comments

Comments
 (0)