Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Checkout Branch"
uses: actions/checkout@v3
- name: "Install JDK 11"
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: "Install JDK 17"
uses: actions/setup-java@v5
with:
distribution: "zulu"
java-version: "11"
java-version: "17"
cache: "gradle"
- name: "Run Tests"
run: ./gradlew test
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ jobs:
env:
sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
mavenSigningKeyId: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY }}
mavenSigningKeyPassword: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY_PASSWORD }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY_PASSWORD }}
steps:
- name: "Checkout Branch"
uses: actions/checkout@v3
Expand Down
89 changes: 0 additions & 89 deletions .scripts/maven.gradle

This file was deleted.

13 changes: 0 additions & 13 deletions .scripts/release.sh

This file was deleted.

1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.0
114 changes: 75 additions & 39 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
apply plugin: 'java'
plugins {
id 'java-library'
id 'maven-publish'
id 'signing'
}

group = 'com.mparticle'
version = '2.7.0'

apply from: '.scripts/maven.gradle'

buildscript {
repositories {
mavenCentral()
}
}
version = project.hasProperty('VERSION') ? project.property('VERSION') : file('VERSION').text.trim()

repositories {
mavenCentral()
Expand All @@ -18,26 +14,15 @@ repositories {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

task sdkJavadocs(type: Javadoc) {
source = sourceSets.main.allJava
title = 'mParticle Server Events SDK API Reference'
failOnError false
getOptions().setNoTimestamp(true)
java {
withSourcesJar()
withJavadocJar()
}

task javadocsJar(type: Jar, dependsOn: sdkJavadocs) {
classifier = 'javadoc'
from javadoc.destinationDir
}

task sourcesJar(type: Jar) {
classifier = 'sources'
from sourceSets.main.allJava
}

artifacts {
archives sourcesJar
archives javadocsJar
javadoc {
title = 'mParticle Server Events SDK API Reference'
options.noTimestamp = true
failOnError = false
}

ext {
Expand All @@ -53,15 +38,66 @@ ext {
}

dependencies {
compile "com.squareup.retrofit2:retrofit:$retrofit_version"
compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "com.google.code.findbugs:jsr305:3.0.2"
compile "io.gsonfire:gson-fire:$json_fire_version"
compile "org.threeten:threetenbp:$threetenbp_version"
testCompile "junit:junit:$junit_version"
testCompile "ch.qos.logback:logback-core:$slf4j_core_version"
testCompile "ch.qos.logback:logback-classic:$slf4j_classic_version"
testCompile "org.slf4j:slf4j-api:$slf4j_version"
api "com.squareup.retrofit2:retrofit:$retrofit_version"
api "com.squareup.retrofit2:converter-scalars:$retrofit_version"
api "com.squareup.retrofit2:converter-gson:$retrofit_version"
api "io.swagger:swagger-annotations:$swagger_annotations_version"
api "com.google.code.findbugs:jsr305:3.0.2"
api "io.gsonfire:gson-fire:$json_fire_version"
api "org.threeten:threetenbp:$threetenbp_version"
testImplementation "junit:junit:$junit_version"
testImplementation "ch.qos.logback:logback-core:$slf4j_core_version"
testImplementation "ch.qos.logback:logback-classic:$slf4j_classic_version"
testImplementation "org.slf4j:slf4j-api:$slf4j_version"
}

publishing {
publications {
maven(MavenPublication) {
from components.java
groupId = 'com.mparticle'
artifactId = 'server-events-sdk'
pom {
name = 'mParticle server-side Java SDK'
description = 'mParticle SDK for server-side Java environments'
url = 'https://github.com/mparticle/mparticle-java-events-sdk'
licenses {
license {
name = 'The Apache Software License, Version 2.0'
url = 'http://www.apache.org/license/LICENSE-2.0.txt'
}
}
scm {
url = 'https://github.com/mparticle/mparticle-java-events-sdk'
connection = 'scm:git:https://github.com/mparticle/mparticle-java-events-sdk'
developerConnection = 'scm:git:git@github.com:mparticle/mparticle-java-events-sdk.git'
}
developers {
developer {
id = 'mParticle'
name = 'mParticle Inc.'
email = 'developers@mparticle.com'
}
}
}
}
}
repositories {
maven {
name = 'sonatype'
url = 'https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/'

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: Is this the correct link?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it gets removed in the next PR since the next one since I split this into 2 commits (support Gradle, which assumes we are still using the previous release process), then updating the release process to adhere to Rokt, so I'm going to go ahead and merge this in.

credentials {
username = System.getenv('sonatypeUsername')
password = System.getenv('sonatypePassword')
}
}
}
}

def signingKey = System.getenv('ORG_GRADLE_PROJECT_signingInMemoryKey')
def signingPassword = System.getenv('ORG_GRADLE_PROJECT_signingInMemoryKeyPassword')
signing {
required { gradle.taskGraph.hasTask('publishMavenPublicationToSonatypeRepository') }
useInMemoryPgpKeys(signingKey, signingPassword)
sign publishing.publications.maven
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading