1
0
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2024-11-23 19:36:16 -06:00

Remove jcenter repository and unused code from gradle config (#1360)

This commit is contained in:
Rafał Borcz 2021-05-28 10:57:25 +02:00 committed by GitHub
parent d13e0adb00
commit 44d5f69de1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 29 deletions

View File

@ -101,10 +101,6 @@ android {
viewBinding = true viewBinding = true
} }
lintOptions {
disable 'HardwareIds'
}
testOptions.unitTests { testOptions.unitTests {
includeAndroidResources = true includeAndroidResources = true
} }
@ -181,7 +177,7 @@ dependencies {
implementation "com.google.android.material:material:1.3.0" implementation "com.google.android.material:material:1.3.0"
implementation "com.github.wulkanowy:material-chips-input:2.2.0" implementation "com.github.wulkanowy:material-chips-input:2.2.0"
implementation "com.github.PhilJay:MPAndroidChart:v3.1.0" implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
implementation 'com.mikhaellopez:circularimageview:4.2.0' implementation 'com.github.lopspower:CircularImageView:4.2.0'
implementation "androidx.work:work-runtime-ktx:$work_manager" implementation "androidx.work:work-runtime-ktx:$work_manager"
playImplementation "androidx.work:work-gcm:$work_manager" playImplementation "androidx.work:work-gcm:$work_manager"
@ -197,7 +193,7 @@ dependencies {
kapt "androidx.hilt:hilt-compiler:$android_hilt" kapt "androidx.hilt:hilt-compiler:$android_hilt"
implementation "androidx.hilt:hilt-work:$android_hilt" implementation "androidx.hilt:hilt-work:$android_hilt"
implementation "com.ncapdevi:frag-nav:3.3.0" implementation 'com.github.ncapdevi:FragNav:3.3.0'
implementation "com.github.YarikSOffice:lingver:1.3.0" implementation "com.github.YarikSOffice:lingver:1.3.0"
implementation "com.squareup.moshi:moshi:$moshi" implementation "com.squareup.moshi:moshi:$moshi"
@ -205,7 +201,7 @@ dependencies {
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi" kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi"
implementation "com.jakewharton.timber:timber:4.7.1" implementation "com.jakewharton.timber:timber:4.7.1"
implementation "at.favre.lib:slf4j-timber:1.0.1" implementation "at.favre.lib:slf4j-timber:1.0.1"
implementation "fr.bipi.treessence:treessence:0.3.2" implementation 'com.github.bastienpaulfr:Treessence:1.0.4'
implementation "com.mikepenz:aboutlibraries-core:$about_libraries" implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
implementation "io.coil-kt:coil:1.2.1" implementation "io.coil-kt:coil:1.2.1"
implementation "io.github.wulkanowy:AppKillerManager:3.0.0" implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
@ -223,7 +219,7 @@ dependencies {
releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker" releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker" debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
debugImplementation "com.amitshekhar.android:debug-db:1.0.6" debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:v1.0.6'
testImplementation "junit:junit:4.13.2" testImplementation "junit:junit:4.13.2"
testImplementation "io.mockk:mockk:$mockk" testImplementation "io.mockk:mockk:$mockk"

View File

@ -1,7 +1,6 @@
package io.github.wulkanowy.data.repositories package io.github.wulkanowy.data.repositories
import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao
import io.github.wulkanowy.data.db.entities.Conference
import io.github.wulkanowy.data.db.entities.SchoolAnnouncement import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student import io.github.wulkanowy.data.db.entities.Student

View File

@ -18,7 +18,6 @@ import io.github.wulkanowy.utils.getThemeAttrColor
import io.github.wulkanowy.utils.lifecycleAwareVariable import io.github.wulkanowy.utils.lifecycleAwareVariable
import io.github.wulkanowy.utils.toFormattedString import io.github.wulkanowy.utils.toFormattedString
import java.time.LocalDateTime import java.time.LocalDateTime
import java.util.Locale
class TimetableDialog : DialogFragment() { class TimetableDialog : DialogFragment() {

View File

@ -51,7 +51,10 @@ private val keyStore: KeyStore
private val cipher: Cipher private val cipher: Cipher
get() { get() {
return if (SDK_INT >= M) Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding", "AndroidKeyStoreBCWorkaround") return if (SDK_INT >= M) Cipher.getInstance(
"RSA/ECB/OAEPWithSHA-256AndMGF1Padding",
"AndroidKeyStoreBCWorkaround"
)
else Cipher.getInstance("RSA/ECB/PKCS1Padding", "AndroidOpenSSL") else Cipher.getInstance("RSA/ECB/PKCS1Padding", "AndroidOpenSSL")
} }
@ -97,8 +100,8 @@ fun decrypt(cipherText: String): String {
CipherInputStream(ByteArrayInputStream(decode(cipherText, DEFAULT)), it).let { input -> CipherInputStream(ByteArrayInputStream(decode(cipherText, DEFAULT)), it).let { input ->
val values = ArrayList<Byte>() val values = ArrayList<Byte>()
var nextByte = 0 var nextByte: Int
while ({ nextByte = input.read(); nextByte }() != -1) { while (run { nextByte = input.read(); nextByte } != -1) {
values.add(nextByte.toByte()) values.add(nextByte.toByte())
} }
val bytes = ByteArray(values.size) val bytes = ByteArray(values.size)

View File

@ -48,6 +48,6 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_chevron_right" app:srcCompat="@drawable/ic_chevron_right"
app:tint="?colorOnBackground" /> app:tint="?colorOnBackground"
tools:ignore="ContentDescription" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -1,13 +1,12 @@
buildscript { buildscript {
ext { ext {
kotlin_version = '1.5.0' kotlin_version = '1.5.10'
about_libraries = '8.8.5' about_libraries = '8.8.5'
hilt_version = "2.35.1" hilt_version = "2.35.1"
} }
repositories { repositories {
mavenCentral() mavenCentral()
google() google()
jcenter()
maven { url "https://plugins.gradle.org/m2/" } maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://developer.huawei.com/repo/" } maven { url "https://developer.huawei.com/repo/" }
} }
@ -26,22 +25,10 @@ buildscript {
} }
} }
project.ext.preDexLibs = !project.hasProperty("disablePreDex")
subprojects {
project.plugins.whenPluginAdded { plugin ->
if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
} else if ("com.android.build.gradle.LibraryPlugin" == plugin.class.name) {
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
}
}
}
allprojects { allprojects {
repositories { repositories {
mavenCentral() mavenCentral()
google() google()
jcenter()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
maven { url "https://developer.huawei.com/repo/" } maven { url "https://developer.huawei.com/repo/" }
} }