Skip to content
This repository has been archived by the owner on Jul 31, 2023. It is now read-only.

Commit

Permalink
Merge pull request #13 from songy23/upgrade
Browse files Browse the repository at this point in the history
Upgrade Gradle, update .gitignore and re-generate wrappers.
  • Loading branch information
Emmanuel T Odeke authored Sep 25, 2018
2 parents 66ef0da + be9f526 commit 6e1f63a
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 6 deletions.
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,14 @@ gradle.properties
.gradle
local.properties
out/

# IntelliJ IDEA
.idea
*.iml
.editorconfig

# Eclipse
.classpath
.project
.settings
bin
8 changes: 7 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ jar.manifest {
'Target-Compatibility': targetCompatibility)
}

buildscript {
repositories {
maven { url "https://plugins.gradle.org/m2/" }
}
}

def opencensusVersion = '0.16.1'

dependencies {
Expand Down Expand Up @@ -76,7 +82,7 @@ uploadArchives {
snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/", configureAuth)

pom.project {
name "OpenCensus"
name "ocjdbc"
packaging 'jar'
description project.description
url 'https://github.com/opencensus-integrations/ocjdbc'
Expand Down
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Tue Sep 25 10:05:48 PDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down

0 comments on commit 6e1f63a

Please sign in to comment.