Skip to content

Commit 8aa630a

Browse files
updated gradle version
1 parent 9ae0123 commit 8aa630a

File tree

10 files changed

+48
-55
lines changed

10 files changed

+48
-55
lines changed

build.gradle

+8-7
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
5+
google()
6+
mavenCentral()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.3'
9+
classpath 'com.android.tools.build:gradle:7.2.2'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
12-
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.3'
13+
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
1314
}
1415
}
1516

1617
allprojects {
1718
repositories {
18-
jcenter()
19+
mavenCentral()
1920
maven {
2021
url "https://maven.google.com"
2122
}
@@ -28,11 +29,11 @@ allprojects {
2829

2930
// http://www.gradle.org/docs/current/dsl/org.gradle.api.plugins.ExtraPropertiesExtension.html
3031
ext {
31-
compileSdkVersion = 26
32+
compileSdkVersion = 31
3233
buildToolsVersion = "26.0.1"
3334

3435
minSdkVersion = 16
35-
targetSdkVersion = 26
36+
targetSdkVersion = 31
3637

3738
supportLibraryVersion = "26.1.0"
3839

@@ -49,4 +50,4 @@ ext.deps = [
4950

5051
task clean(type: Delete) {
5152
delete rootProject.buildDir
52-
}
53+
}

debugoverlay-ext-netstats/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
}
1212

1313
dependencies {
14-
compile project(':debugoverlay')
15-
testCompile deps.junit
14+
implementation project(':debugoverlay')
15+
testImplementation deps.junit
1616
}
1717

1818
// for maven central deployment

debugoverlay-ext-timber/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ android {
1111
}
1212

1313
dependencies {
14-
compile project(':debugoverlay')
15-
compile 'com.jakewharton.timber:timber:4.5.1'
16-
testCompile deps.junit
14+
implementation project(':debugoverlay')
15+
implementation 'com.jakewharton.timber:timber:4.5.1'
16+
testImplementation deps.junit
1717
}
1818

1919
// for maven central deployment

debugoverlay-no-op/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ android {
2828
}
2929

3030
dependencies {
31-
testCompile deps.junit
32-
testCompile deps.mockitocore
31+
testImplementation deps.junit
32+
testImplementation deps.mockitocore
3333
}
3434

3535
// for maven central deployment

debugoverlay/build.gradle

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
apply plugin: 'com.android.library'
1+
apply plugin: 'com.android.application'
22
// make sure this line comes *after* you apply the Android plugin
33
apply plugin: 'com.getkeepsafe.dexcount'
44

5-
plugins {
6-
id 'maven-publish'
7-
}
5+
apply plugin: 'maven-publish'
6+
87

98
android {
109
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -32,22 +31,18 @@ android {
3231
}
3332

3433
dependencies {
35-
compile fileTree(dir: 'libs', include: ['*.jar'])
36-
compile "com.android.support:support-compat:${supportLibraryVersion}"
37-
compile "com.android.support:support-core-utils:${supportLibraryVersion}"
38-
compile "com.android.support:support-annotations:${supportLibraryVersion}"
34+
implementation fileTree(dir: 'libs', include: ['*.jar'])
35+
implementation "com.android.support:support-compat:${supportLibraryVersion}"
36+
implementation "com.android.support:support-core-utils:${supportLibraryVersion}"
37+
implementation "com.android.support:support-annotations:${supportLibraryVersion}"
3938
}
4039

4140
publishing {
4241
publications {
4342
release(MavenPublication) {
44-
groupId = 'com.github.AlticeLabsProjects:DebugOverlay-Android'
45-
artifactId = 'DebugOverlay-Android-lib'
46-
version = '0.0.0'
47-
48-
afterEvaluate {
49-
from components.release
50-
}
43+
groupId = 'com.github.AlticeLabsProjects.DebugOverlay-Android'
44+
artifactId = 'DebugOverlay-Android'
45+
version = '1.0.0'
5146
}
5247
}
5348
}

debugoverlay/src/main/java/com/ms_square/debugoverlay/DebugOverlayService.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,10 @@ private PendingIntent getNotificationIntent(String action) {
202202
if (config.getActivityName() != null) {
203203
try {
204204
Intent intent = new Intent(this, Class.forName(config.getActivityName()));
205-
pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
206-
PendingIntent.getActivity(this, PendingIntent.FLAG_MUTABLE, intent, PendingIntent.FLAG_CANCEL_CURRENT);
207-
}else{
208-
PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT);
205+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
206+
pendingIntent = PendingIntent.getActivity(this, PendingIntent.FLAG_IMMUTABLE, intent, PendingIntent.FLAG_CANCEL_CURRENT);
207+
} else {
208+
pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT);
209209
}
210210
} catch (ClassNotFoundException ne) {
211211
Log.w(TAG, config.getActivityName() + " was not found - " + ne.getMessage());

gradle.properties

-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ org.gradle.jvmargs=-Xmx3072m
2121
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
2222
# org.gradle.parallel=true
2323

24-
# will be true by default starting Android Studio 2.3 and after
25-
android.enableBuildCache=true
26-
2724
# For maven central
2825
GROUP=com.ms-square
2926
VERSION_NAME=1.1.3
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Mar 26 21:43:33 MDT 2017
1+
#Thu Jun 15 15:14:16 WEST 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

jitpack.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
jdk:
2-
- openjdk8
2+
- openjdk11

sample/build.gradle

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
repositories {
2-
jcenter()
2+
mavenCentral()
33
flatDir {
44
dirs 'libs'
55
}
@@ -61,36 +61,36 @@ android {
6161
}
6262

6363
dependencies {
64-
compile fileTree(dir: 'libs', include: ['*.jar'])
64+
implementation fileTree(dir: 'libs', include: ['*.jar'])
6565

66-
debugCompile project(':debugoverlay')
67-
releaseCompile project(':debugoverlay-no-op')
68-
testCompile project(':debugoverlay-no-op')
66+
debugImplementation project(':debugoverlay')
67+
releaseImplementation project(':debugoverlay-no-op')
68+
testImplementation project(':debugoverlay-no-op')
6969

70-
compile(project(':debugoverlay-ext-timber')) {
70+
implementation(project(':debugoverlay-ext-timber')) {
7171
exclude module: 'debugoverlay'
7272
}
7373

74-
compile(project(':debugoverlay-ext-netstats')) {
74+
implementation(project(':debugoverlay-ext-netstats')) {
7575
exclude module: 'debugoverlay'
7676
}
7777

78-
compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
79-
compile "com.android.support:design:${supportLibraryVersion}"
78+
implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
79+
implementation "com.android.support:design:${supportLibraryVersion}"
8080

81-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
81+
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
8282

83-
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
84-
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
85-
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
83+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5'
84+
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
85+
testImplementation'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
8686

8787
// Set this dependency to build and run Espresso tests
88-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
88+
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
8989
exclude group: 'com.android.support', module: 'support-annotations'
9090
})
9191

9292
// ScreenShot taker for instrumentation tests
93-
androidTestCompile(name:'cloudtestingscreenshotter_lib', ext:'aar')
93+
androidTestImplementation(name:'cloudtestingscreenshotter_lib', ext:'aar')
9494

95-
testCompile deps.junit
95+
testImplementation deps.junit
9696
}

0 commit comments

Comments
 (0)