diff --git a/android-config.gradle b/android-config.gradle index 7095c71..1d52edc 100644 --- a/android-config.gradle +++ b/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 diff --git a/auth-legacy/build.gradle b/auth-legacy/build.gradle index 37a91ff..65219f7 100644 --- a/auth-legacy/build.gradle +++ b/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" \ No newline at end of file +apply from: "$rootDir/jitpack/publish.gradle" \ No newline at end of file diff --git a/auth-legacy/src/main/AndroidManifest.xml b/auth-legacy/src/main/AndroidManifest.xml index 9c4c9d5..c4e6c98 100644 --- a/auth-legacy/src/main/AndroidManifest.xml +++ b/auth-legacy/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/auth/build.gradle b/auth/build.gradle index 477da6d..8ff90b3 100644 --- a/auth/build.gradle +++ b/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" \ No newline at end of file +apply from: "$rootDir/jitpack/publish.gradle" \ No newline at end of file diff --git a/auth/src/main/AndroidManifest.xml b/auth/src/main/AndroidManifest.xml index 3d59492..5a686da 100644 --- a/auth/src/main/AndroidManifest.xml +++ b/auth/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/bintray/config-bintray.gradle b/bintray/config-bintray.gradle deleted file mode 100644 index bbb6dac..0000000 --- a/bintray/config-bintray.gradle +++ /dev/null @@ -1,41 +0,0 @@ -apply plugin: 'com.jfrog.bintray' - -version = authVersionName - -if (project.getPlugins().hasPlugin('com.android.application') || - project.getPlugins().hasPlugin('com.android.library')) { - task androidSourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.source - } -} else { - task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource - } -} - -artifacts { - if (project.getPlugins().hasPlugin('com.android.application') || - project.getPlugins().hasPlugin('com.android.library')) { - archives androidSourcesJar - } else { - archives sourcesJar - } -} - -bintray { - user = System.getenv('BINTRAY_USERNAME') - key = System.getenv('BINTRAY_KEY') - - configurations = ['archives'] - pkg { - repo = "BazaarAuth" - name = project.package_id - websiteUrl = 'https://github.com/cafebazaar/CafeBazaarAuth' - vcsUrl = 'https://github.com/cafebazaar/CafeBazaarAuth.git' - licenses = ["Apache-2.0"] - publish = true - publicDownloadNumbers = true - } -} \ No newline at end of file diff --git a/bintray/install-bintray.gradle b/bintray/install-bintray.gradle deleted file mode 100644 index 6af8cfb..0000000 --- a/bintray/install-bintray.gradle +++ /dev/null @@ -1,50 +0,0 @@ -apply plugin: 'com.github.dcendents.android-maven' - -group = 'com.farsitel.bazaar' - -install { - repositories.mavenInstaller { - pom { - project { - packaging 'aar' - groupId 'com.farsitel.bazaar' - artifactId project.artifact_id - - name 'bazaarAuth' - url 'https://github.com/cafebazaar/CafeBazaarAuth' - - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - - developers { - developer { - id 'shayanpourvatan' - name 'Shayan Pourvatan' - email 'shayanpourvatan@gmail.com' - } - } - - scm { - connection 'https://github.com/cafebazaar/CafeBazaarAuth.git' - developerConnection 'https://github.com/cafebazaar/CafeBazaarAuth.git' - url 'https://github.com/cafebazaar/CafeBazaarAuth' - } - } - withXml { - def dependenciesNode = asNode().appendNode('dependencies') - configurations.api.allDependencies.each { - if (it.group != null && (it.name != null || "unspecified" == it.name) && it.version != null) { - def dependencyNode = dependenciesNode.appendNode('dependency') - dependencyNode.appendNode('groupId', it.group) - dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) - } - } - } - } - } -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index fa48cd7..ad9a556 100644 --- a/build.gradle +++ b/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' } } diff --git a/core/build.gradle b/core/build.gradle index 180c55f..cbb1fab 100644 --- a/core/build.gradle +++ b/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" \ No newline at end of file +apply from: "$rootDir/jitpack/publish.gradle" \ No newline at end of file diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml index 0c52dbd..b1fed63 100644 --- a/core/src/main/AndroidManifest.xml +++ b/core/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> 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(':') } diff --git a/core/src/main/java/com/farsitel/bazaar/core/view/BazaarInstallerActivity.kt b/core/src/main/java/com/farsitel/bazaar/core/view/BazaarInstallerActivity.kt index 0061701..9fb6629 100644 --- a/core/src/main/java/com/farsitel/bazaar/core/view/BazaarInstallerActivity.kt +++ b/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(R.id.install).setOnClickListener { openInstallBazaarPage() } - installDesc.text = getString(R.string.install_desc, appName) + findViewById(R.id.installDesc).text = getString(R.string.install_desc, appName) } private fun initUpdateView() { - update.setOnClickListener { + findViewById(R.id.update).setOnClickListener { openUpdateBazaarInApplication() } - updateDesc.text = getString(R.string.update_desc, appName) + findViewById(R.id.updateDesc).text = getString(R.string.update_desc, appName) } private fun openUpdateBazaarInApplication() { diff --git a/core/src/main/java/com/farsitel/bazaar/util/PackageManager.kt b/core/src/main/java/com/farsitel/bazaar/util/PackageManager.kt index 65f20a5..c390ed1 100644 --- a/core/src/main/java/com/farsitel/bazaar/util/PackageManager.kt +++ b/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() } diff --git a/core/src/main/res/layout/cafe_installer_view.xml b/core/src/main/res/layout/cafe_installer_view.xml index bba59ad..43d48d7 100644 --- a/core/src/main/res/layout/cafe_installer_view.xml +++ b/core/src/main/res/layout/cafe_installer_view.xml @@ -10,11 +10,9 @@ android:paddingTop="20dp"> + android:background="@color/black_divider" /> + android:background="@color/black_divider" /> - + - + diff --git a/sample/src/main/java/com/farsitel/bazaar/sample/auth/MainActivity.kt b/sample/src/main/java/com/farsitel/bazaar/sample/auth/MainActivity.kt index 49f6c81..65a8c17 100644 --- a/sample/src/main/java/com/farsitel/bazaar/sample/auth/MainActivity.kt +++ b/sample/src/main/java/com/farsitel/bazaar/sample/auth/MainActivity.kt @@ -3,6 +3,9 @@ package com.farsitel.bazaar.sample.auth import android.content.Intent import android.os.Bundle import android.view.View +import android.widget.Button +import android.widget.EditText +import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.farsitel.bazaar.BazaarClientProxy @@ -15,13 +18,20 @@ import com.farsitel.bazaar.core.model.SignInOption import com.farsitel.bazaar.storage.BazaarStorage import com.farsitel.bazaar.storage.callback.BazaarStorageCallback import com.farsitel.bazaar.util.ext.toReadableString -import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { private lateinit var loginButton: View private lateinit var client: BazaarSignInClient + private val updateBazaar by lazy { findViewById