Skip to content

Commit a2d5fa9

Browse files
author
[email protected]
committed
After upgrading to AGP 7.2 and Gradle 7.4.2
1 parent 8dc11b3 commit a2d5fa9

File tree

13 files changed

+164
-152
lines changed

13 files changed

+164
-152
lines changed

‎.idea/gradle.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎app/build.gradle.kts

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
plugins {
2+
id("com.android.application")
3+
kotlin("android")
4+
}
5+
6+
android {
7+
compileSdk = 32
8+
9+
defaultConfig {
10+
applicationId = "com.techiness.progressdialogexample"
11+
minSdk = 24
12+
targetSdk = 32
13+
versionCode = 1
14+
versionName = "1.0"
15+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
16+
}
17+
18+
buildTypes {
19+
getByName("release") {
20+
isMinifyEnabled = false
21+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
22+
}
23+
}
24+
compileOptions {
25+
sourceCompatibility = JavaVersion.VERSION_11
26+
targetCompatibility = JavaVersion.VERSION_11
27+
}
28+
kotlinOptions {
29+
jvmTarget = JavaVersion.VERSION_11.toString()
30+
}
31+
}
32+
33+
dependencies {
34+
//implementation(project(":progressdialoglibrary"))
35+
val progressVersion = "1.4.3"
36+
implementation("androidx.appcompat:appcompat:1.6.0-alpha03")
37+
implementation("com.google.android.material:material:1.6.0")
38+
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
39+
testImplementation("junit:junit:4.13.2")
40+
androidTestImplementation("androidx.test.ext:junit:1.1.3")
41+
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
42+
implementation("com.github.techinessoverloaded:progress-dialog:$progressVersion")
43+
}

‎app/proguard-rules.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Add project specific ProGuard rules here.
22
# You can control the set of applied configuration files using the
3-
# proguardFiles setting in build.gradle.
3+
# proguardFiles setting in build.gradle.kts.kts.
44
#
55
# For more details, see
66
# http://developer.android.com/guide/developing/tools/proguard.html

‎app/src/main/java/com/techiness/progressdialogexample/MainActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import androidx.appcompat.app.AppCompatActivity;
55
import androidx.appcompat.app.AppCompatDelegate;
66
import androidx.appcompat.widget.SwitchCompat;
7-
87
import android.content.Intent;
98
import android.os.Build;
109
import android.os.Bundle;
@@ -24,7 +23,7 @@ protected void onCreate(Bundle savedInstanceState)
2423
super.onCreate(savedInstanceState);
2524
setContentView(R.layout.activity_main);
2625
bindViews();
27-
if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.R)
26+
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
2827
{
2928
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
3029
progressDialog = new ProgressDialog(ProgressDialog.MODE_DETERMINATE,this,ProgressDialog.THEME_FOLLOW_SYSTEM);

‎build.gradle renamed to ‎build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:7.1.3'
9-
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
10-
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.6.21'
8+
classpath("com.android.tools.build:gradle:7.2.0")
9+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
10+
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.6.21")
1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
1313
}
@@ -17,10 +17,10 @@ allprojects {
1717
repositories {
1818
google()
1919
mavenCentral()
20-
maven { url 'https://jitpack.io' }
20+
maven { url = uri("https://jitpack.io") }
2121
}
2222
}
2323

24-
task clean(type: Delete) {
25-
delete rootProject.buildDir
24+
tasks.register("clean",Delete::class) {
25+
delete(rootProject.buildDir)
2626
}

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Apr 09 17:44:52 IST 2022
1+
#Fri May 20 21:11:42 IST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

‎progressdialoglibrary/build.gradle

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎progressdialoglibrary/build.gradle.kts

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
plugins {
2+
id("com.android.library")
3+
kotlin("android")
4+
id("maven-publish")
5+
id("org.jetbrains.dokka")
6+
}
7+
8+
android {
9+
compileSdk = 32
10+
11+
defaultConfig {
12+
minSdk = 24
13+
targetSdk = 32
14+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
15+
consumerProguardFiles("consumer-rules.pro")
16+
}
17+
18+
buildFeatures {
19+
viewBinding = true
20+
}
21+
22+
buildTypes {
23+
getByName("release") {
24+
isMinifyEnabled = true
25+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
26+
}
27+
}
28+
compileOptions {
29+
sourceCompatibility = JavaVersion.VERSION_11
30+
targetCompatibility = JavaVersion.VERSION_11
31+
}
32+
kotlinOptions {
33+
jvmTarget = JavaVersion.VERSION_11.toString()
34+
}
35+
publishing {
36+
singleVariant("release") {
37+
withSourcesJar()
38+
}
39+
}
40+
}
41+
42+
afterEvaluate {
43+
publishing {
44+
publications {
45+
register<MavenPublication>("release") {
46+
from(components["release"])
47+
groupId = "com.github.techinessoverloaded"
48+
artifactId = "progress-dialog"
49+
version = "1.4.4-rc1"
50+
}
51+
}
52+
}
53+
}
54+
55+
dependencies {
56+
implementation("androidx.appcompat:appcompat:1.6.0-alpha03")
57+
implementation("com.google.android.material:material:1.6.0")
58+
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
59+
testImplementation("junit:junit:4.13.2")
60+
androidTestImplementation("androidx.test.ext:junit:1.1.3")
61+
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
62+
}

‎progressdialoglibrary/proguard-rules.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Add project specific ProGuard rules here.
22
# You can control the set of applied configuration files using the
3-
# proguardFiles setting in build.gradle.
3+
# proguardFiles setting in build.gradle.kts.kts.
44
#
55
# For more details, see
66
# http://developer.android.com/guide/developing/tools/proguard.html

0 commit comments

Comments
 (0)