Merge pull request #218 from opentok/dev

Merge dev into main

Author: SMadani

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 4.6.0
+current_version = 4.7.0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}

.github/workflows/build.yml

@@ -11,23 +11,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 8.0.x, 9.0.x, 11.0.x, 14 ]
+        java: [8, 11, 17]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
       - name: Checkout the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: ${{matrix.java}}
+          java-version: ${{ matrix.java }}
+          distribution: 'zulu'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -37,4 +38,4 @@ jobs:
         run: ./gradlew build
 
       - name: Run Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2

.github/workflows/publish.yml

@@ -0,0 +1,47 @@
+name: Publish to Nexus
+on:
+  release:
+    types: [published]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.release.target_commitish }}
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: 3.8
+      - name: Install bump2version
+        run: |
+          python -m pip install --upgrade pip
+          git config --global user.email "44278943+NexmoDev@users.noreply.github.com"
+          git config --global user.name "NexmoDev"
+          git config --global github.token ${{ secrets.GITHUB_TOKEN }}
+          pip install bump2version
+      - name: Bump Version
+        run: bump2version --new-version ${{ github.event.release.tag_name }} patch &&
+             git tag ${{ github.event.release.tag_name }} -f &&
+             git push && git push --tags origin --force
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'temurin'
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Cache Gradle packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+      - name: publish with gradle
+        env:
+          signingKey: ${{secrets.SIGNING_KEY}}
+          signingPassword: ${{secrets.SIGNING_PASSWORD}}
+          OSS_USERNAME: ${{secrets.OSS_USERNAME}}
+          OSS_PASSWORD: ${{secrets.OSS_PASSWORD}}
+        run: OSS_USERNAME=$OSS_USERNAME OSS_PASSWORD=$OSS_PASSWORD signingKey=$signingKey signingPassword=$signingPassword gradle publish --info

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2021 Vonage.
+Copyright (c) 2014-2022 Vonage.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -587,7 +587,7 @@ Reference documentation is available at
 ## Requirements
 
 You need an OpenTok API key and API secret, which you can obtain by logging into your
-[TokBox account](https://tokbox.com/account).
+[Vonage Video API account](https://tokbox.com/account).
 
 The OpenTok Java SDK requires JDK 8 or greater to compile. Runtime requires Java SE 8 or greater.
 This project is tested on both OpenJDK and Oracle implementations.

build.gradle

@@ -1,21 +1,44 @@
 plugins {
-    id "com.github.hierynomus.license" version "0.11.0"
+    id 'java-library'
+    id 'jacoco'
+    id 'signing'
+    id 'maven-publish'
+    id "com.github.hierynomus.license" version "0.16.1"
 }
 
-apply plugin: 'java'
-apply plugin: 'maven'
-apply plugin: 'signing'
-apply plugin: 'idea'
-apply plugin: 'eclipse'
-apply plugin: 'license'
-apply plugin: 'jacoco'
-
 group = 'com.tokbox'
 archivesBaseName = 'opentok-server-sdk'
-version = '4.6.0'
+version = '4.7.0'
+
+sourceCompatibility = "1.8"
+targetCompatibility = "1.8"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'com.github.tomakehurst:wiremock:1.58'
+    implementation 'commons-lang:commons-lang:2.6'
+    implementation 'commons-validator:commons-validator:1.7'
+    implementation 'org.asynchttpclient:async-http-client:2.12.3'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
+    implementation 'commons-codec:commons-codec:1.15'
+    implementation 'org.bitbucket.b_c:jose4j:0.7.11'
+}
+
+task sourcesJar(type: Jar) {
+    archiveClassifier.set("sources")
+    from sourceSets.main.allSource
+}
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
+}
 
 task javadocJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier.set("javadoc")
     from javadoc
 }
 javadoc {
@@ -28,35 +51,16 @@ javadoc {
     }
 }
 
+jacoco {
+    toolVersion = "0.8.8"
+}
 jacocoTestReport {
     reports {
-        xml.enabled true
-        html.enabled false
+        xml.getRequired().set(true)
+        html.getRequired().set(true)
     }
 }
-
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testCompile group: 'junit', name: 'junit', version: '[4.3,5.0]'
-    testCompile group: 'com.github.tomakehurst', name: 'wiremock', version: '[1.45,2.0]'
-    compile group: 'commons-lang', name: 'commons-lang', version: '[2.6,3.0]'
-    compile group: 'org.asynchttpclient', name: 'async-http-client', version: '[2.0,2.99999)'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '[2.3.1,2.99999)'
-    compile group: 'commons-validator', name: 'commons-validator', version: '[1.4.0,1.99999)'
-    compile group: 'commons-codec', name: 'commons-codec', version: '[1.9,1.99999]'
-    compile group: 'org.bitbucket.b_c', name: 'jose4j', version: '[0.7,1.0)'
-    // TODO: find out how to initialize these dependencies properly, or remove them
-    //compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.5'
-    //compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.5'
-}
+check.dependsOn jacocoTestReport
 
 license {
     header rootProject.file('codequality/HEADER')
@@ -68,77 +72,83 @@ artifacts {
 }
 
 ext.isReleaseVersion = hasProperty('isReleaseVersion') ? isReleaseVersion : false
-signing {
-    required { isReleaseVersion && gradle.taskGraph.hasTask("uploadArchives") }
-    sign configurations.archives
-}
-
 ext.ossrhUsername = hasProperty('ossrhUsername') ? ossrhUsername : 'dummyuser'
 ext.ossrhPassword = hasProperty('ossrhPassword') ? ossrhPassword : 'dummypass'
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2") {
-              authentication(userName: ossrhUsername, password: ossrhPassword)
-            }
-
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots") {
-              authentication(userName: ossrhUsername, password: ossrhPassword)
-            }
-
-            pom.project {
-                name 'OpenTok Java SDK'
-                packaging 'jar'
-                description 'The OpenTok Java SDK lets you generate sessions and tokens for OpenTok applications. This version of the SDK also includes support for working with OpenTok 2.0 archives.'
-                url 'http://www.tokbox.com/opentok'
-
-                scm {
-                    connection 'scm:git:https://github.com/opentok/Opentok-Java-SDK.git'
-                    developerConnection 'scm:git:https://github.com/opentok/Opentok-Java-SDK.git'
-                    url 'opentok.github.io/opentok-java-sdk'
-                }
 
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            pom {
+                name = "OpenTok Java SDK"
+                artifactId = 'opentok-server-sdk'
+                packaging = 'jar'
+                description = "The OpenTok Java SDK lets you generate sessions and tokens for OpenTok applications. This version of the SDK also includes support for working with OpenTok 2.0 archives."
+                url = "https://github.com/opentok/opentok-java-sdk"
                 licenses {
                     license {
-                        name 'MIT License'
-                        url 'http://www.opensource.org/licenses/mit-license'
+                        name = 'MIT License'
+                        url = "https://raw.github.com/opentok/opentok-java-sdk/main/LICENCE.txt"
                     }
                 }
-
                 developers {
                     developer {
-                        id 'manasdpradhan'
-                        name 'Manas Pradhan'
-                        email 'manas@tokbox.com'
-                        organization 'Vonage.'
+                        id = "devrel"
+                        name = "Vonage Devrel"
+                        email = "devrel@vonage.com"
+                    }
+                    developer {
+                        id = 'manasdpradhan'
+                        name = 'Manas Pradhan'
+                        email = 'manas@tokbox.com'
+                        organization = 'Vonage'
+                    }
+                    developer {
+                        id = 'aoberoi'
+                        name = 'Ankur Oberoi'
+                        email = 'aoberoi@gmail.com'
+                        organization = 'Vonage'
                     }
                     developer {
-                        id 'aoberoi'
-                        name 'Ankur Oberoi'
-                        email 'aoberoi@gmail.com'
-                        organization 'Vonage.'
+                        id = 'slorello89'
+                        name =  'Steve Lorello'
+                        email = 'steve.lorello@vonage.com'
+                        organization = 'Vonage'
                     }
+                    developer {
+                        id = 'SMadani'
+                        name = 'Sina Madani'
+                        email = 'sina.madani@vonage.com'
+                        organization = 'Vonage'
+                    }
+                }
+                scm {
+                    connection = "scm:git@github.com/opentok/opentok-java-sdk"
+                    developerConnection = "scm:git@github.com/opentok/opentok-java-sdk"
+                    url = "http://github.com/opentok/opentok-java-sdk"
+                }
+
+                issueManagement {
+                    system = "GitHub"
+                    url = "https://http://github.com/opentok/opentok-java-sdk"
                 }
             }
         }
     }
-}
-
-test {
-    maxHeapSize = "1024m"
-}
-
-sourceCompatibility = 1.8
-// credit: http://stackoverflow.com/a/22681854/305340
-tasks.withType(JavaCompile) {
-    options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
-    doFirst {
-        if (System.env.JDK8_HOME != null) {
-            options.bootClasspath = "$System.env.JDK8_HOME/jre/lib/rt.jar"
-            options.bootClasspath += "$File.pathSeparator$System.env.JDK8_HOME/jre/lib/jce.jar"
-            // and other specific JDK jars
+    repositories {
+        maven {
+            def releasesRepoUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+            def snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+            credentials.username(System.getenv("OSS_USERNAME"))
+            credentials.password(System.getenv("OSS_PASSWORD"))
+            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
         }
     }
 }
+
+signing {
+    def signingKey = System.getenv("signingKey")
+    def signingPassword = System.getenv("signingPassword")
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign publishing.publications.mavenJava
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Mon Apr 05 14:22:26 EDT 2021
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

sample/Archiving/build.gradle

@@ -6,10 +6,10 @@ repositories {
 }
 
 dependencies {
-    compile project(':')
-    compile group: 'com.github.codingricky', name: 'spark-core-16', version: '1.1'
-    compile group: 'org.freemarker', name: 'freemarker', version: '2.3.19'
-    compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.6'
+    implementation project(':')
+    implementation 'com.github.codingricky:spark-core-16:1.1'
+    implementation 'org.freemarker:freemarker:2.3.19'
+    implementation 'org.slf4j:slf4j-simple:1.7.6'
 }
 
 run.systemProperty 'API_KEY', ''