Some cleanup

Author: jmartinesp

scripts/publish-module.gradle

@@ -46,6 +46,14 @@ afterEvaluate {
     }
 }
 
+nexusPublishing {
+    useStaging.convention(project.provider {
+        def isSnapshot = PUBLISH_VERSION.endsWith("-SNAPSHOT")
+        println("Is snapshot: $isSnapshot. Version: $PUBLISH_VERSION")
+        !isSnapshot
+    })
+}
+
 signing {
     useInMemoryPgpKeys(
             rootProject.ext["signing.keyId"],

scripts/publish-root.gradle

@@ -31,7 +31,4 @@ nexusPublishing {
             snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
         }
     }
-    useStaging.convention(project.provider {
-        !project.hasProperty("snapshot")
-    })
 }

scripts/release_sdk.py

@@ -153,19 +153,14 @@ def get_asset_path(root_project_dir: str, module: Module) -> str:
         raise ValueError(f"Unknown module: {module}")
 
 
-def get_publish_task(module: Module, is_snapshot: bool) -> str:
+def get_publish_task(module: Module) -> str:
     if module == Module.SDK:
-        command = ":sdk:sdk-android:publishToSonatype"
+        return ":sdk:sdk-android:publishToSonatype"
     elif module == Module.CRYPTO:
-        command = ":crypto:crypto-android:publishToSonatype"
+        return ":crypto:crypto-android:publishToSonatype"
     else:
         raise ValueError(f"Unknown module: {module}")
 
-    if is_snapshot:
-        return f"{command} -Psnapshot"
-    else:
-        return command
-
 
 def run_publish_close_and_release_tasks(root_project_dir, publish_task: str):
     gradle_command = f"./gradlew {publish_task} closeAndReleaseStagingRepository"
@@ -216,7 +211,7 @@ def main(args: argparse.Namespace):
     # First release on Maven
     run_publish_close_and_release_tasks(
         project_root,
-        get_publish_task(args.module, args.version.endswith("-SNAPSHOT")),
+        get_publish_task(args.module),
     )
 
     if not args.version.endswith("-SNAPSHOT"):