Fix upload to sonatype step (#12)

Telefonica · Mar 31, 2023 · e5fbadd · e5fbadd
1 parent 3aca3ed
commit e5fbadd
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 21 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,7 +2,6 @@ name: "Create release"
 on:
   release:
       types: [published]
-  workflow_dispatch:
 jobs:
   release:
     runs-on: ubuntu-latest

diff --git a/app/build.gradle b/app/build.gradle
@@ -4,14 +4,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
     //noinspection GradleDependency
-    buildToolsVersion "30.0.1"
 
     defaultConfig {
         applicationId "com.telefonica.androidlogger.app"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0.0"
 
@@ -38,4 +37,4 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:$support_version'
     implementation project(':library')
-}
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AndroidLogger"
         tools:ignore="AllowBackup">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -20,4 +22,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/build.gradle b/build.gradle
@@ -42,7 +42,11 @@ tasks.detekt.jvmTarget = "1.8"
 allprojects {
 
     group = 'com.telefonica.androidlogger'
-    version = '1.1.0'
+    if (System.getProperty("SNAPSHOT_VERSION") != null) {
+        version = System.getProperty("SNAPSHOT_VERSION")+"-SNAPSHOT"
+    } else {
+        version = System.getProperty("LIBRARY_VERSION") ?: "undefined"
+    }
 
     repositories {
         google()

diff --git a/library/build.gradle b/library/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 33
     }
 
     flavorDimensions "loggerMode"
@@ -37,4 +37,4 @@ dependencies {
     testImplementation 'junit:junit:4.13'
 }
 
-apply from: "${rootProject.projectDir}/mavencentral.gradle"
+apply from: "${rootProject.projectDir}/mavencentral.gradle"
diff --git a/mavencentral.gradle b/mavencentral.gradle
@@ -43,14 +43,14 @@ publishing {
                 }
                 developers {
                     developer {
-                        id = 'dpastor'
-                        name = 'David Pastor Herranz'
-                        email = 'david.pastor.herranz@telefonica.com'
+                        id = 'android-team-telefonica'
+                        name = 'Android Team'
+                        email = 'cto-android@telefonica.com'
                     }
                 }
                 scm {
-                    connection = 'scm:git:github.com/Telefonica/android-logger.git'
-                    developerConnection = 'scm:git:ssh://github.com/Telefonica/android-logger.git'
+                    connection = 'scm:git:https://github.com/Telefonica/android-logger.git'
+                    developerConnection = 'scm:git:ssh://https://github.com/Telefonica/android-logger.git'
                     url = 'https://github.com/Telefonica/android-logger/tree/main'
                 }
                 withXml {
@@ -85,14 +85,14 @@ publishing {
                 }
                 developers {
                     developer {
-                        id = 'dpastor'
-                        name = 'David Pastor Herranz'
-                        email = 'david.pastor.herranz@telefonica.com'
+                        id = 'android-team-telefonica'
+                        name = 'Android Team'
+                        email = 'cto-android@telefonica.com'
                     }
                 }
                 scm {
-                    connection = 'scm:git:github.com/Telefonica/android-logger.git'
-                    developerConnection = 'scm:git:ssh://github.com/Telefonica/android-logger.git'
+                    connection = 'scm:git:https://github.com/Telefonica/android-logger.git'
+                    developerConnection = 'scm:git:ssh://https://github.com/Telefonica/android-logger.git'
                     url = 'https://github.com/Telefonica/android-logger/tree/main'
                 }
                 withXml {