Manabu-GT · Jun 15, 2023 · Jun 15, 2023 · Jun 15, 2023 · Jun 15, 2023 · Jun 15, 2023
diff --git a/build.gradle b/build.gradle
@@ -2,20 +2,21 @@
 
 buildscript {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:7.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.3'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             url "https://maven.google.com"
         }
@@ -28,11 +29,11 @@ allprojects {
 
 // http://www.gradle.org/docs/current/dsl/org.gradle.api.plugins.ExtraPropertiesExtension.html
 ext {
-    compileSdkVersion = 26
+    compileSdkVersion = 31
     buildToolsVersion = "26.0.1"
 
-    minSdkVersion = 16
-    targetSdkVersion = 26
+    minSdkVersion = 26
+    targetSdkVersion = 31
 
     supportLibraryVersion = "26.1.0"
 
@@ -49,4 +50,4 @@ ext.deps = [
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
diff --git a/debugoverlay-ext-netstats/build.gradle b/debugoverlay-ext-netstats/build.gradle
@@ -11,9 +11,6 @@ android {
 }
 
 dependencies {
-    compile project(':debugoverlay')
-    testCompile deps.junit
+    implementation project(':debugoverlay')
+    testImplementation deps.junit
 }
-
-// for maven central deployment
-apply from: 'https://raw.githubusercontent.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
diff --git a/debugoverlay-ext-timber/build.gradle b/debugoverlay-ext-timber/build.gradle
@@ -11,10 +11,7 @@ android {
 }
 
 dependencies {
-    compile project(':debugoverlay')
-    compile 'com.jakewharton.timber:timber:4.5.1'
-    testCompile deps.junit
-}
-
-// for maven central deployment
-apply from: 'https://raw.githubusercontent.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
+    implementation project(':debugoverlay')
+    implementation 'com.jakewharton.timber:timber:5.0.1'
+    testImplementation deps.junit
+}
diff --git a/debugoverlay-no-op/build.gradle b/debugoverlay-no-op/build.gradle
@@ -28,9 +28,6 @@ android {
 }
 
 dependencies {
-    testCompile deps.junit
-    testCompile deps.mockitocore
-}
-
-// for maven central deployment
-apply from: 'https://raw.githubusercontent.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
+    testImplementation deps.junit
+    testImplementation deps.mockitocore
+}
diff --git a/debugoverlay/build.gradle b/debugoverlay/build.gradle
@@ -1,14 +1,25 @@
-apply plugin: 'com.android.library'
+apply plugin: 'com.android.application'
 // make sure this line comes *after* you apply the Android plugin
 apply plugin: 'com.getkeepsafe.dexcount'
 
+apply plugin: 'maven-publish'
+
+
 android {
+    publishing {
+        singleVariant("release") {
+
+        }
+    }
+
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
+        versionName '1.0.0'
+        versionCode 1
     }
 
     // force usage of prefix to avoid naming conflicts
@@ -28,11 +39,21 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile "com.android.support:support-compat:${supportLibraryVersion}"
-    compile "com.android.support:support-core-utils:${supportLibraryVersion}"
-    compile "com.android.support:support-annotations:${supportLibraryVersion}"
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "com.android.support:support-compat:${supportLibraryVersion}"
+    implementation "com.android.support:support-core-utils:${supportLibraryVersion}"
+    implementation "com.android.support:support-annotations:${supportLibraryVersion}"
 }
 
-// for maven central deployment
-apply from: 'https://raw.githubusercontent.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+
+                version '1.0.0'
+            }
+        }
+    }
+}
diff --git a/debugoverlay/src/main/java/com/ms_square/debugoverlay/DebugOverlayService.java b/debugoverlay/src/main/java/com/ms_square/debugoverlay/DebugOverlayService.java
@@ -202,7 +202,11 @@ private PendingIntent getNotificationIntent(String action) {
             if (config.getActivityName() != null) {
                 try {
                     Intent intent = new Intent(this, Class.forName(config.getActivityName()));
-                    pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                        pendingIntent = PendingIntent.getActivity(this, PendingIntent.FLAG_IMMUTABLE, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+                    } else {
+                        pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+                    }
                 } catch (ClassNotFoundException ne) {
                     Log.w(TAG, config.getActivityName() + " was not found - " + ne.getMessage());
                 }

diff --git a/gradle.properties b/gradle.properties
@@ -21,24 +21,22 @@ org.gradle.jvmargs=-Xmx3072m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-# will be true by default starting Android Studio 2.3 and after
-android.enableBuildCache=true
-
 # For maven central
-GROUP=com.ms-square
+GROUP=com.github.AlticeLabsProjects
 VERSION_NAME=1.1.3
 VERSION_CODE=6
 POM_PACKAGING=aar
 POM_DESCRIPTION=Android library to display various debugging information in an overlay window
 
-POM_URL=https://github.com/Manabu-GT/DebugOverlay-Android
-POM_SCM_URL=https://github.com/Manabu-GT/DebugOverlay-Android
-POM_SCM_CONNECTION=scm:git:git://github.com/Manabu-GT/DebugOverlay-Android.git
-POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/Manabu-GT/DebugOverlay-Android.git
+POM_URL=https://github.com/AlticeLabsProjects/DebugOverlay-Android
+POM_SCM_URL=https://github.com/AlticeLabsProjectsDebugOverlay-Android
+POM_SCM_CONNECTION=scm:git:git://github.com/AlticeLabsProjects/DebugOverlay-Android.git
+POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/AlticeLabsProjects/DebugOverlay-Android.git
 
 POM_LICENCE_NAME=The Apache Software License, Version 2.0
 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 
-POM_DEVELOPER_ID=Manabu-GT
-POM_DEVELOPER_NAME=Manabu Shimobe
+POM_DEVELOPER_ID=AlticeLabsProjects
+POM_DEVELOPER_NAME=AlticeLabsProjects
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Mar 26 21:43:33 MDT 2017
+#Thu Jun 15 15:14:16 WEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/jitpack.yml b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk11
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,5 +1,5 @@
 repositories {
-    jcenter()
+    mavenCentral()
     flatDir {
         dirs 'libs'
     }
@@ -61,36 +61,36 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    debugCompile project(':debugoverlay')
-    releaseCompile project(':debugoverlay-no-op')
-    testCompile project(':debugoverlay-no-op')
+    debugImplementation project(':debugoverlay')
+    releaseImplementation project(':debugoverlay-no-op')
+    testImplementation project(':debugoverlay-no-op')
 
-    compile(project(':debugoverlay-ext-timber')) {
+    implementation(project(':debugoverlay-ext-timber')) {
         exclude module: 'debugoverlay'
     }
 
-    compile(project(':debugoverlay-ext-netstats')) {
+    implementation(project(':debugoverlay-ext-netstats')) {
         exclude module: 'debugoverlay'
     }
 
-    compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
-    compile "com.android.support:design:${supportLibraryVersion}"
+    implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
+    implementation "com.android.support:design:${supportLibraryVersion}"
 
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
 
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5'
+    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+    testImplementation'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
 
     // Set this dependency to build and run Espresso tests
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
     // ScreenShot taker for instrumentation tests
-    androidTestCompile(name:'cloudtestingscreenshotter_lib', ext:'aar')
+    androidTestImplementation(name:'cloudtestingscreenshotter_lib', ext:'aar')
 
-    testCompile deps.junit
+    testImplementation deps.junit
 }