Skip to content

Android Studio Dolphin #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 2, 2022
Merged

Android Studio Dolphin #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e58737b
Move namespace
hannesa2 Nov 2, 2022
566ce21
Gradle 7.5
hannesa2 Nov 2, 2022
c64249c
Android Studio Dolphin
hannesa2 Nov 2, 2022
9f1018f
api33
hannesa2 Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions MPChartExample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ plugins {
}

android {
compileSdkVersion 32
compileSdkVersion 33
defaultConfig {
applicationId "com.xxmassdeveloper.mpchartexample"
minSdkVersion 19
targetSdkVersion 32
targetSdkVersion 33
versionCode 57
versionName '3.1.0'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -19,6 +19,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
namespace 'com.xxmassdeveloper.mpchartexample'
}

dependencies {
Expand Down
3 changes: 1 addition & 2 deletions MPChartExample/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.xxmassdeveloper.mpchartexample">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

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

Expand Down
5 changes: 3 additions & 2 deletions MPChartLib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ plugins {
}

android {
compileSdkVersion 32
compileSdkVersion 33
defaultConfig {
minSdkVersion 19
targetSdkVersion 32
targetSdkVersion 33

consumerProguardFiles 'proguard-project.txt'
}
Expand All @@ -20,6 +20,7 @@ android {
testOptions {
unitTests.returnDefaultValues = true // this prevents "not mocked" error
}
namespace 'com.github.mikephil.charting'
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion MPChartLib/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.github.mikephil.charting">
<manifest>

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

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.1'
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading