update gradle, publishing and dependencies

android-config.gradle

@@ -1,10 +1,9 @@
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 36
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 29
+        minSdkVersion 17
+        targetSdkVersion 36
         versionCode authVersionCode
         versionName authVersionName
         vectorDrawables.useSupportLibrary = true

auth-legacy/build.gradle

@@ -1,8 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply from: '../android-config.gradle'
 
+android {
+    namespace 'com.farsitel.bazaar.auth.legacy'
+}
+
 ext {
     package_id = 'Auth-Legacy'
     artifact_id = 'auth-legacy'
@@ -13,5 +16,4 @@ dependencies {
     api project(":core")
 }
 
-apply from: "$rootDir/bintray/install-bintray.gradle"
-apply from: "$rootDir/bintray/config-bintray.gradle"
+apply from: "$rootDir/jitpack/publish.gradle"

auth-legacy/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="com.farsitel.bazaar.auth.legacy"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>

auth/build.gradle

@@ -1,8 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply from: '../android-config.gradle'
 
+android {
+    namespace 'com.farsitel.bazaar.auth'
+}
+
 ext {
     package_id = 'Auth'
     artifact_id = 'auth'
@@ -13,5 +16,4 @@ dependencies {
     api project(":core")
 }
 
-apply from: "$rootDir/bintray/install-bintray.gradle"
-apply from: "$rootDir/bintray/config-bintray.gradle"
+apply from: "$rootDir/jitpack/publish.gradle"

auth/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.farsitel.bazaar.auth">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <queries>
         <package android:name="com.farsitel.bazaar" />

build.gradle

@@ -2,20 +2,14 @@
 
 buildscript {
     apply from: "$rootDir/version-manager.gradle"
-    ext {
-        kotlin_version = '1.3.71'
-    }
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
+        gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath "com.android.tools.build:gradle:$pluginVersions.gradle"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$libraryVersions.kotlin"
-
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$pluginVersions.bintray"
-        classpath "com.github.dcendents:android-maven-gradle-plugin:$pluginVersions.androidmaven"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -25,7 +19,8 @@ allprojects {
     apply from: "$rootDir/version-manager.gradle"
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        gradlePluginPortal()
         maven { url 'https://jitpack.io' }
 
     }

core/build.gradle

@@ -1,8 +1,23 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply from: '../android-config.gradle'
 
+android {
+    namespace 'com.farsitel.bazaar.core'
+
+    buildFeatures {
+        aidl true
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+}
+kotlin {
+    jvmToolchain(17)
+}
+
 ext {
     package_id = 'Core'
     artifact_id = 'core'
@@ -15,5 +30,4 @@ dependencies {
     implementation "androidx.core:core-ktx:$libraryVersions.androidx"
 }
 
-apply from: "$rootDir/bintray/install-bintray.gradle"
-apply from: "$rootDir/bintray/config-bintray.gradle"
+apply from: "$rootDir/jitpack/publish.gradle"

core/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.farsitel.bazaar.core">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity

core/src/main/java/com/farsitel/bazaar/core/security/Security.kt

@@ -37,15 +37,17 @@ object Security {
                 packageName,
                 PackageManager.GET_SIGNING_CERTIFICATES
             )
-            packageInfo.signingInfo.apkContentsSigners
+            packageInfo.signingInfo?.apkContentsSigners ?: emptyArray()
         } else {
             val packageInfo = packageManager.getPackageInfo(
                 packageName,
                 PackageManager.GET_SIGNATURES
             )
-            packageInfo.signatures
+            packageInfo.signatures ?: emptyArray()
         }
 
+        if (signatures.isEmpty()) return false
+
         for (sig in signatures) {
             val input: InputStream = ByteArrayInputStream(sig.toByteArray())
             val certificateFactory: CertificateFactory = CertificateFactory.getInstance("X509")
@@ -70,7 +72,7 @@ object Security {
             } else if (length > 2) {
                 suggestedHex = suggestedHex.substring(length - 2, length)
             }
-            stringBuilder.append(suggestedHex.toUpperCase(Locale.getDefault()))
+            stringBuilder.append(suggestedHex.uppercase(Locale.getDefault()))
             if (index < array.size - 1) {
                 stringBuilder.append(':')
             }

core/src/main/java/com/farsitel/bazaar/core/view/BazaarInstallerActivity.kt

@@ -4,14 +4,13 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import com.farsitel.bazaar.BAZAAR_PACKAGE_NAME
 import com.farsitel.bazaar.core.R
 import com.farsitel.bazaar.core.model.InstallerType
 import com.farsitel.bazaar.util.getAppName
 import com.farsitel.bazaar.util.ext.safeStartActivity
-import kotlinx.android.synthetic.main.cafe_installer_view.*
-import kotlinx.android.synthetic.main.cafe_update_view.*
 
 class BazaarInstallerActivity : AppCompatActivity() {
 
@@ -46,19 +45,19 @@ class BazaarInstallerActivity : AppCompatActivity() {
     }
 
     private fun initInstallView() {
-        install.setOnClickListener {
+        findViewById<TextView>(R.id.install).setOnClickListener {
             openInstallBazaarPage()
         }
 
-        installDesc.text = getString(R.string.install_desc, appName)
+        findViewById<TextView>(R.id.installDesc).text = getString(R.string.install_desc, appName)
     }
 
     private fun initUpdateView() {
-        update.setOnClickListener {
+        findViewById<TextView>(R.id.update).setOnClickListener {
             openUpdateBazaarInApplication()
         }
 
-        updateDesc.text = getString(R.string.update_desc, appName)
+        findViewById<TextView>(R.id.updateDesc).text = getString(R.string.update_desc, appName)
     }
 
     private fun openUpdateBazaarInApplication() {

core/src/main/java/com/farsitel/bazaar/util/PackageManager.kt

@@ -52,5 +52,5 @@ internal fun PackageInfo.appName(context: Context, locale: Locale): String? = tr
         applicationInfo.loadLabel(context.packageManager).toString()
     }
 } catch (e: Exception) {
-    applicationInfo.loadLabel(context.packageManager).toString()
+    applicationInfo?.loadLabel(context.packageManager)?.toString()
 }

core/src/main/res/layout/cafe_installer_view.xml

@@ -10,11 +10,9 @@
     android:paddingTop="20dp">
 
     <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/bazaarLogo"
         android:layout_width="wrap_content"
         android:layout_height="36dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/bazaar_logo_with_text" />
 
     <View
@@ -24,8 +22,7 @@
         android:layout_marginStart="@dimen/default_margin_double_half"
         android:layout_marginTop="@dimen/default_margin_double_half"
         android:layout_marginEnd="@dimen/default_margin_double_half"
-        android:background="@color/black_divider"
-        app:layout_constraintTop_toBottomOf="@id/bazaarLogo" />
+        android:background="@color/black_divider" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/installDesc"

core/src/main/res/layout/cafe_update_view.xml

@@ -13,9 +13,6 @@
         android:id="@+id/bazaarLogo"
         android:layout_width="wrap_content"
         android:layout_height="36dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/bazaar_logo_with_text" />
 
     <View
@@ -25,8 +22,7 @@
         android:layout_marginStart="@dimen/default_margin_double_half"
         android:layout_marginTop="@dimen/default_margin_double_half"
         android:layout_marginEnd="@dimen/default_margin_double_half"
-        android:background="@color/black_divider"
-        app:layout_constraintTop_toBottomOf="@id/bazaarLogo" />
+        android:background="@color/black_divider" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/updateDesc"

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip

jitpack/publish.gradle

@@ -0,0 +1,34 @@
+apply plugin: 'maven-publish'
+
+group = 'com.github.cafebazaar.CafeBazaarAuth'
+version = authVersionName
+
+android {
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
+        }
+    }
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+                artifactId = project.artifact_id
+
+                pom {
+                    name = project.package_id
+                    url = 'https://github.com/cafebazaar/CafeBazaarAuth'
+                    developers {
+                        developer {
+                            id = 'cafebazaar'
+                            name = 'Cafe Bazaar'
+                        }
+                    }
+                }
+            }
+        }
+    }
+}