Rename master to multivariant (#72)

* upgrade gradle

* master -> multivariant (fix #44)

* set sourceCompatibility to 1.8

Author: carlanton

.gitignore

@@ -1,2 +1,3 @@
 build
 out
+.gradle

README.md

@@ -31,9 +31,9 @@ implementation 'io.lindstrom:m3u8-parser:0.29'
 
 ## Usage
 
-### Create master playlist
+### Create multivariant playlist
 ```java
-MasterPlaylist playlist = MasterPlaylist.builder()
+MultivariantPlaylist playlist = MultivariantPlaylist.builder()
     .version(4)
     .independentSegments(true)
     .addAlternativeRenditions(AlternativeRendition.builder()
@@ -55,11 +55,11 @@ MasterPlaylist playlist = MasterPlaylist.builder()
             .build())
     .build();
 
-MasterPlaylistParser parser = new MasterPlaylistParser();
+MultivariantPlaylistParser parser = new MultivariantPlaylistParser();
 System.out.println(parser.writePlaylistAsString(playlist));
 ```
 
-This code should produce the following master playlist:
+This code should produce the following multivariant playlist:
 ```
 #EXTM3U
 #EXT-X-VERSION:4
@@ -113,15 +113,15 @@ http://media.example.com/third.ts
 #EXT-X-ENDLIST
 ```
 
-### Parse master playlist
+### Parse multivariant playlist
 ```java
-MasterPlaylistParser parser = new MasterPlaylistParser();
+MultivariantPlaylistParser parser = new MultivariantPlaylistParser();
 
 // Parse playlist
-MasterPlaylist playlist = parser.readPlaylist(Paths.get("path/to/master.m3u8"));
+MultivariantPlaylist playlist = parser.readPlaylist(Paths.get("path/to/multivariant.m3u8"));
 
 // Update playlist version
-MasterPlaylist updated = MasterPlaylist.builder()
+MultivariantPlaylist updated = Multivariant.builder()
                                         .from(playlist)
                                         .version(2)
                                         .build();
@@ -153,7 +153,7 @@ By default, the parser will throw an exception on unsupported tags and attribute
 passing a `ParsingMode` to the parser. Example:
 
 ```java
-MasterPlaylistParser lenientParser = new MasterPlaylistParser(ParsingMode.LENIENT);
+MultivariantPlaylistParser lenientParser = new MultivariantPlaylistParser(ParsingMode.LENIENT);
 ```
 
 Currently two modes are available:

build.gradle

@@ -1,10 +1,18 @@
-group 'io.lindstrom'
-version '0.29'
+plugins {
+    id 'idea'
+    id 'java-library'
+    id 'maven-publish'
+    id 'signing'
+}
+
+group = 'io.lindstrom'
+version = '0.29'
 
-apply plugin: 'idea'
-apply plugin: 'java'
-apply plugin: 'maven'
-apply plugin: 'signing'
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    withJavadocJar()
+    withSourcesJar()
+}
 
 ext {
     ideaGeneratedSources = file('build/generated/sources/annotationProcessor/java')
@@ -15,81 +23,76 @@ idea.module {
     generatedSourceDirs += ideaGeneratedSources
 }
 
-sourceCompatibility = 1.8
-
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    compileOnly 'org.immutables:value:2.5.6'
+    compileOnly 'org.immutables:value:2.10.1'
     annotationProcessor "org.immutables:value:2.5.6"
-    testCompile 'junit:junit:4.12'
+    testImplementation('junit:junit:4.12')
 }
 
-task javadocJar(type: Jar) {
-    classifier = 'javadoc'
-    from javadoc
+test {
+    //useJUnitPlatform()
 }
 
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
+ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
-artifacts {
-    archives javadocJar, sourcesJar
-}
+publishing {
+    repositories {
+        maven {
+            def releaseRepo = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            def snapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
 
-archivesBaseName = "m3u8-parser"
+            name = "OSSRH"
+            url = isReleaseVersion ? releaseRepo : snapshotRepo
 
-if (project.hasProperty('ossrhUsername')) {
-    signing {
-        sign configurations.archives
+            credentials {
+                username = findProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME")
+                password = findProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD")
+            }
+        }
     }
 
-    uploadArchives {
-        repositories {
-            mavenDeployer {
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+    publications {
+        mavenJava(MavenPublication) {
+            artifactId = 'm3u8-parser'
 
-                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                    authentication(userName: ossrhUsername, password: ossrhPassword)
-                }
+            from components.java
 
-                snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                    authentication(userName: ossrhUsername, password: ossrhPassword)
-                }
+            pom {
+                groupId = 'io.lindstrom'
+                name = 'm3u8-parser'
+                description = 'm3u8 parser'
+                url = 'https://github.com/carlanton/m3u8-parser'
+                packaging = 'jar'
 
-                pom.project {
-                    name 'm3u8-parser'
-                    packaging 'jar'
-                    artifactId 'm3u8-parser'
-                    description 'm3u8 parser'
-                    url 'https://github.com/carlanton/m3u8-parser'
-
-                    scm {
-                        connection 'scm:git:https://github.com/carlanton/m3u8-parser.git'
-                        developerConnection 'scm:git:git@github.com:carlanton/m3u8-parser.git'
-                        url 'https://github.com/carlanton/m3u8-parser.git'
+                licenses {
+                    license {
+                        name = 'MIT License'
+                        url = 'https://github.com/carlanton/m3u8-parser/blob/master/LICENSE'
                     }
+                }
 
-                    licenses {
-                        license {
-                            name 'MIT License'
-                            url 'https://github.com/carlanton/m3u8-parser/blob/master/LICENSE'
-                        }
-                    }
+                scm {
+                    url = 'https://github.com/carlanton/m3u8-parser.git'
+                    connection = 'scm:git:https://github.com/carlanton/m3u8-parser.git'
+                    developerConnection = 'scm:git:git@github.com:carlanton/m3u8-parser.git'
+                }
 
-                    developers {
-                        developer {
-                            id 'antonlindstrom'
-                            name 'Anton Lindström'
-                            email 'carlantonlindstrom@gmail.com'
-                        }
+                developers {
+                    developer {
+                        id = 'antonlindstrom'
+                        name = 'Anton Lindström'
+                        email = 'carlantonlindstrom@gmail.com'
                     }
                 }
             }
         }
     }
 }
+
+signing {
+    sign publishing.publications.mavenJava
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip