Merge pull request #510 from AppDevNext/AndroidStudioGiraffe

hannesa2 · web-flow · commit 1f79ed8c5491 · 2023-08-03T21:46:11.000+02:00
Android Studio Giraffe
diff --git a/LogcatCoreLib/build.gradle b/LogcatCoreLib/build.gradle
@@ -29,10 +29,10 @@ dependencies {
     api 'com.jakewharton.timber:timber:5.0.1'
 }
 
-project.afterEvaluate {
-    publishing {
-        publications {
-            release(MavenPublication) {
+publishing {
+    publications {
+        release(MavenPublication) {
+            afterEvaluate {
                 from components.release
             }
         }
diff --git a/LogcatCoreUI/build.gradle b/LogcatCoreUI/build.gradle
@@ -34,10 +34,10 @@ dependencies {
     api 'com.google.android.material:material:1.9.0'
 }
 
-project.afterEvaluate {
-    publishing {
-        publications {
-            release(MavenPublication) {
+publishing {
+    publications {
+        release(MavenPublication) {
+            afterEvaluate {
                 from components.release
             }
         }
diff --git a/LogcatCountlyLib/build.gradle b/LogcatCountlyLib/build.gradle
@@ -25,10 +25,10 @@ dependencies {
     api "ly.count.android:sdk:22.09.3"
 }
 
-project.afterEvaluate {
-    publishing {
-        publications {
-            release(MavenPublication) {
+publishing {
+    publications {
+        release(MavenPublication) {
+            afterEvaluate {
                 from components.release
             }
         }
diff --git a/LogcatCrashlyticLib/build.gradle b/LogcatCrashlyticLib/build.gradle
@@ -32,10 +32,10 @@ dependencies {
     api 'com.google.firebase:firebase-analytics-ktx'
 }
 
-project.afterEvaluate {
-    publishing {
-        publications {
-            release(MavenPublication) {
+publishing {
+    publications {
+        release(MavenPublication) {
+            afterEvaluate {
                 from components.release
             }
         }
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.0"
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,6 @@
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx1536m
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/jitpack.yml b/jitpack.yml
@@ -1,4 +1,4 @@
 jdk:
-  - openjdk11
+  - openjdk17
 install:
   - ./gradlew :LogcatCoreLib:assembleRelease :LogcatCoreLib:publishToMavenLocal :LogcatCoreUI:assembleRelease :LogcatCoreUI:publishToMavenLocal :LogcatCrashlyticLib:assembleRelease :LogcatCrashlyticLib:publishToMavenLocal :LogcatCountlyLib:assembleRelease :LogcatCountlyLib:publishToMavenLocal

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ dependencies {`
`29`	`29`	`api 'com.jakewharton.timber:timber:5.0.1'`
`30`	`30`	`}`
`31`	`31`
`32`		`-project.afterEvaluate {`
`33`		`- publishing {`
`34`		`- publications {`
`35`		`- release(MavenPublication) {`
	`32`	`+publishing {`
	`33`	`+ publications {`
	`34`	`+ release(MavenPublication) {`
	`35`	`+ afterEvaluate {`
`36`	`36`	`from components.release`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,10 @@ dependencies {`
`34`	`34`	`api 'com.google.android.material:material:1.9.0'`
`35`	`35`	`}`
`36`	`36`
`37`		`-project.afterEvaluate {`
`38`		`- publishing {`
`39`		`- publications {`
`40`		`- release(MavenPublication) {`
	`37`	`+publishing {`
	`38`	`+ publications {`
	`39`	`+ release(MavenPublication) {`
	`40`	`+ afterEvaluate {`
`41`	`41`	`from components.release`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,10 @@ dependencies {`
`25`	`25`	`api "ly.count.android:sdk:22.09.3"`
`26`	`26`	`}`
`27`	`27`
`28`		`-project.afterEvaluate {`
`29`		`- publishing {`
`30`		`- publications {`
`31`		`- release(MavenPublication) {`
	`28`	`+publishing {`
	`29`	`+ publications {`
	`30`	`+ release(MavenPublication) {`
	`31`	`+ afterEvaluate {`
`32`	`32`	`from components.release`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ dependencies {`
`32`	`32`	`api 'com.google.firebase:firebase-analytics-ktx'`
`33`	`33`	`}`
`34`	`34`
`35`		`-project.afterEvaluate {`
`36`		`- publishing {`
`37`		`- publications {`
`38`		`- release(MavenPublication) {`
	`35`	`+publishing {`
	`36`	`+ publications {`
	`37`	`+ release(MavenPublication) {`
	`38`	`+ afterEvaluate {`
`39`	`39`	`from components.release`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:7.4.2'`
	`10`	`+ classpath 'com.android.tools.build:gradle:8.1.0'`
`11`	`11`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`12`	`12`	`classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.0"`
`13`	`13`