Update publishing plugin and simplify gradle build

BrunoHenrique00 · Mar 15, 2023 · 9cee289 · 9cee289
1 parent a40742b
commit 9cee289
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 81 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -4,62 +4,50 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
-        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0'
+        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.24.0'
     }
 }
 
 allprojects {
-    version = '0.3.46'
+    version = '0.3.47'
 }
 
 subprojects {
 
     apply plugin: 'com.android.library'
-    apply plugin: 'maven-publish'
     apply plugin: 'com.vanniktech.maven.publish'
 
-    plugins.withId('com.vanniktech.maven.publish') {
-        mavenPublish {
-            group = 'com.alphacephei'
-            version = version
-            sonatypeHost = 's01'
-            androidVariantToPublish = 'release'
-        }
-    }
-
     repositories {
         google()
         mavenCentral()
     }
 
-    publishing {
-        publications {
-            aar(MavenPublication) {
-                groupId 'com.alphacephei'
-                version version
-                pom {
-                    url = 'http://www.alphacephei.com.com/vosk/'
-                    licenses {
-                        license {
-                            name = 'The Apache License, Version 2.0'
-                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                        }
-                    }
-                    developers {
-                        developer {
-                            id = 'com.alphacephei'
-                            name = 'Alpha Cephei Inc'
-                            email = '[email protected]'
-                        }
-                    }
-                    scm {
-                        connection = 'scm:git:git://github.com/alphacep/vosk-api.git'
-                        url = 'https://github.com/alphacep/vosk-api/'
-                    }
+    mavenPublishing {
+        publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.S01, false)
+        signAllPublications()
+    }
+
+    mavenPublishing {
+        pom {
+            url = 'http://www.alphacephei.com.com/vosk/'
+            licenses {
+                license {
+                    name = 'The Apache License, Version 2.0'
+                    url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
                 }
             }
+            developers {
+                developer {
+                    id = 'com.alphacephei'
+                    name = 'Alpha Cephei Inc'
+                    email = '[email protected]'
+                }
+            }
+            scm {
+                connection = 'scm:git:git://github.com/alphacep/vosk-api.git'
+                url = 'https://github.com/alphacep/vosk-api/'
+            }
         }
     }
-
 }
diff --git a/android/lib/build.gradle b/android/lib/build.gradle
@@ -3,14 +3,15 @@ def pomName = "Vosk Android"
 def pomDescription = "Vosk speech recognition library for Android"
 
 android {
-    compileSdkVersion 29
+    namespace 'org.vosk'
+    compileSdkVersion 33
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 6
+        targetSdkVersion 33
+        versionCode 10
         versionName = version
         archivesBaseName = archiveName
-        ndkVersion = "23.1.7779620"
+        ndkVersion = "25.2.9519653"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -29,27 +30,10 @@ dependencies {
 
 //preBuild.dependsOn buildVosk
 
-publishing {
-    publications {
-        aar(MavenPublication) {
-            artifactId = archiveName
-            artifact("$buildDir/outputs/aar/$archiveName-release.aar")
-            pom {
-                name = pomName
-                description = pomDescription
-            }
-            //generate pom nodes for dependencies
-            pom.withXml {
-                def dependenciesNode = asNode().appendNode('dependencies')
-                configurations.implementation.allDependencies.each { dependency ->
-                    if (dependency.name != 'unspecified') {
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
+mavenPublishing {
+    coordinates("com.alphacephei", archiveName, version)
+    pom {
+        name = pomName
+        description = pomDescription
     }
 }
diff --git a/android/lib/src/main/AndroidManifest.xml b/android/lib/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.vosk">
+<manifest>
 </manifest>
diff --git a/android/lib/src/main/java/org/vosk/android/SpeechService.java b/android/lib/src/main/java/org/vosk/android/SpeechService.java
@@ -19,9 +19,9 @@
 import android.media.MediaRecorder.AudioSource;
 import android.os.Handler;
 import android.os.Looper;
+import android.annotation.SuppressLint;
 
 import org.vosk.Recognizer;
-
 import java.io.IOException;
 
 /**
@@ -48,6 +48,7 @@ public class SpeechService {
      *
      * @throws IOException thrown if audio recorder can not be created for some reason.
      */
+    @SuppressLint("MissingPermission")
     public SpeechService(Recognizer recognizer, float sampleRate) throws IOException {
         this.recognizer = recognizer;
         this.sampleRate = (int) sampleRate;

diff --git a/android/model-en/build.gradle b/android/model-en/build.gradle
@@ -3,11 +3,12 @@ def pomName = "Vosk English Model"
 def pomDescription = "Small English model for Android"
 
 android {
-    compileSdkVersion 29
+    namespace "org.vosk"
+    compileSdkVersion 33
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 6
+        targetSdkVersion 33
+        versionCode 10
         versionName = version
         archivesBaseName = archiveName
     }
@@ -33,15 +34,10 @@ tasks.register('genUUID') {
 
 preBuild.dependsOn(genUUID)
 
-publishing {
-    publications {
-        aar(MavenPublication) {
-            artifactId = archiveName
-            artifact("$buildDir/outputs/aar/$archiveName-release.aar")
-            pom {
-                name = pomName
-                description = pomDescription
-            }
-        }
+mavenPublishing {
+    coordinates("com.alphacephei", archiveName, version)
+    pom {
+        name = pomName
+        description = pomDescription
     }
 }
diff --git a/android/model-en/src/main/AndroidManifest.xml b/android/model-en/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.vosk.model.en">
+<manifest>
 </manifest>