Skip to content

Commit

Permalink
Remove unused strings and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Rafał Borcz committed Dec 8, 2022
1 parent 33e8529 commit c6efd50
Show file tree
Hide file tree
Showing 13 changed files with 194 additions and 225 deletions.
27 changes: 12 additions & 15 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 29
namespace 'com.thelittlefireman.appkillermanager_exemple'
compileSdkVersion 33
defaultConfig {
applicationId "com.thelittlefireman.appkillermanager_exemple"
minSdkVersion 15
targetSdkVersion 29
versionCode 4
versionName "3.0.0"
targetSdkVersion 33
versionCode 5
versionName "3.0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand All @@ -19,20 +19,17 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
//buildToolsVersion '27.0.3'
}

dependencies {
implementation project(path: ':appkillermanager')

implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "androidx.core:core-ktx:1.9.0"
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.jakewharton.timber:timber:5.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

implementation "androidx.core:core-ktx:1.2.0"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.jakewharton.timber:timber:4.7.1'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
}
10 changes: 5 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.thelittlefireman.appkillermanager_exemple">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand All @@ -9,13 +8,14 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
</manifest>
38 changes: 6 additions & 32 deletions appkillermanager/build.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,17 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-android'
apply plugin: "com.github.ben-manes.versions"

android {
compileSdkVersion 29

namespace 'com.thelittlefireman.appkillermanager'
compileSdkVersion 33
defaultConfig {
minSdkVersion 15
targetSdkVersion 29

versionCode rootProject.ext.libVersionCode
versionName rootProject.ext.libVersionName

targetSdkVersion 33
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

}

buildTypes {
debug {

}
debug {}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
Expand All @@ -30,23 +21,6 @@ android {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.jakewharton.timber:timber:4.7.1'
implementation "androidx.core:core-ktx:1.2.0"
implementation 'com.jakewharton.timber:timber:5.0.1'
implementation "androidx.core:core-ktx:1.9.0"
}

dependencyUpdates.resolutionStrategy {
componentSelection { rules ->
rules.all { ComponentSelection selection ->
boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm'].any { qualifier ->
selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
}
if (rejected) {
selection.reject('Release candidate')
}
}
}
}

// applied specifically at the bottom
apply from: './scripts/bintrayConfig.gradle'
3 changes: 1 addition & 2 deletions appkillermanager/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.thelittlefireman.appkillermanager">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="oppo.permission.OPPO_COMPONENT_SAFE" />
<uses-permission android:name="android.permission.INTERNET" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ object ActionsUtils {
fun isIntentAvailable(ctx: Context?, intent: Intent?): Boolean {
return if (ctx != null && intent != null) {
val mgr = ctx.packageManager
val list = mgr.queryIntentActivities(intent,
PackageManager.MATCH_DEFAULT_ONLY)
list != null && list.size > 0
val list = mgr.queryIntentActivities(
intent,
PackageManager.MATCH_DEFAULT_ONLY
)
list.size > 0
} else {
false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ object SystemUtils {
val packageManager = context.packageManager
var applicationInfo: ApplicationInfo? = null
try {
applicationInfo = packageManager.getApplicationInfo(context.applicationInfo.packageName, 0)
applicationInfo =
packageManager.getApplicationInfo(context.applicationInfo.packageName, 0)
} catch (e: PackageManager.NameNotFoundException) {
}
return (if (applicationInfo != null) packageManager.getApplicationLabel(applicationInfo) else "Unknown") as String
Expand Down
7 changes: 0 additions & 7 deletions appkillermanager/src/main/res/values-fr/strings.xml

This file was deleted.

7 changes: 0 additions & 7 deletions appkillermanager/src/main/res/values/strings.xml

This file was deleted.

29 changes: 2 additions & 27 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,30 +1,20 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.72'
ext.kotlin_version = '1.7.21'

repositories {
google()
jcenter()
mavenCentral()
mavenLocal()
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.3'
classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// Two necessary plugins
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
classpath "com.github.ben-manes:gradle-versions-plugin:0.21.0"
}
}

allprojects {
repositories {
google()
jcenter()
mavenCentral()
mavenLocal()
maven { url 'https://maven.fabric.io/public' }
Expand All @@ -35,18 +25,3 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}

wrapper {
gradleVersion = '6.4.1'
distributionUrl = distributionUrl.replace("bin", "all")
}
ext{
// ValidateTor Library Info
libVersionCode = 5
libVersionName = '3.0.0'
libPomUrl = 'https://github.com/wulkanowy/AppKillerManager'
libGithubRepo = 'wulkanowy/AppKillerManager'
libModuleName = 'AppKillerManager'
libModuleDesc = 'Android library to handle flaky App killer manager (Xiaomi, Huawei, letv, ...) and prevent from : not showing notification, services not start at boot, etc'
libBintrayName = 'AppKillerManager'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit c6efd50

Please sign in to comment.