Skip to content

Commit

Permalink
Update gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
eugene-tkachenko committed Jun 2, 2024
1 parent 89c3d39 commit 1374082
Show file tree
Hide file tree
Showing 16 changed files with 223 additions and 172 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: ['https://www.buymeacoffee.com/gektor650'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
custom: ['https://www.paypal.com/donate/?business=T9DG8B4C6BX8C&no_recurring=0&currency_code=USD'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ android.iml
build
*.iml
local.properties
.DS_Store
*/.DS_Store
.DS_Store
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
JFrog Bintray is shutting down, so the OkHttpProfiler plugin was migrated to Maven Central.
To migrate your plugin just change old package (com.itkacher) to the:

implementation("com.localebro:okhttpprofiler:1.0.8")
implementation 'com.localebro:okhttpprofiler:1.0.8'

and change

Expand Down
17 changes: 9 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 29
compileSdkVersion 33
defaultConfig {
applicationId "com.itkacher.okprofilerexample"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 33
versionCode 1
versionName "1.0"
}
Expand Down Expand Up @@ -34,16 +34,17 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
namespace 'com.localebro.okprofilerexample'
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
implementation 'com.squareup.okhttp3:okhttp:4.9.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'com.squareup.okhttp3:okhttp:4.10.0'
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.google.code.gson:gson:2.10.1'
// implementation project(path: ':okhttpprofiler')
implementation ('com.localebro:okhttpprofiler:1.0.8')
}
7 changes: 4 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.localebro.okprofilerexample">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />

Expand All @@ -14,7 +13,9 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="AllowBackup,UnusedAttribute">
<activity android:name=".MainActivity">
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" />
Expand Down
48 changes: 22 additions & 26 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
apply plugin: 'io.github.gradle-nexus.publish-plugin'
apply plugin: 'org.jetbrains.dokka'
//apply plugin: 'io.github.gradle-nexus.publish-plugin'
//apply plugin: 'org.jetbrains.dokka'
//
//buildscript {
//
// repositories {
// maven { url "https://plugins.gradle.org/m2/" }
// google()
// mavenCentral()
// }
// dependencies {
// classpath 'com.android.tools.build:gradle:7.4.2'
// classpath "io.github.gradle-nexus:publish-plugin:1.1.0"
// classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30"
// }
//}

buildscript {

repositories {
maven { url "https://plugins.gradle.org/m2/" }
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath "io.github.gradle-nexus:publish-plugin:1.1.0"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30"
}
}

allprojects {
repositories {
google()
jcenter()
}
}

task clean(type: Delete) {
delete rootProject.buildDir
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.0.0' apply false
id 'com.android.library' version '8.0.0' apply false
id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
}

apply from: "${rootDir}/publish/nexus.gradle"
//apply from: "${rootDir}/publish/nexus.gradle"
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Tue Oct 13 16:02:13 EEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
Loading

0 comments on commit 1374082

Please sign in to comment.