Skip to content

Commit

Permalink
11.4.5 release
Browse files Browse the repository at this point in the history
  • Loading branch information
MikolajMichalczak committed Jul 9, 2024
1 parent ed21d0e commit 215f1e4
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 32 deletions.
2 changes: 1 addition & 1 deletion Example/HighFit/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 20 additions & 16 deletions Example/HighFit/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
plugins {
id 'com.android.application'
}

android {
compileSdkVersion 28
buildToolsVersion "29.0.2"
defaultConfig {
compileSdk 30
}
defaultConfig {
applicationId "com.highsoft.highfit"
minSdkVersion 21
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
Expand All @@ -19,22 +21,24 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
}


dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
testImplementation 'junit:junit:4.13.2'
implementation (name: 'highcharts-release', ext: 'aar', group: "com.highsoft.highcharts", version: "11.4.0")
implementation 'com.google.code.gson:gson:2.10'
androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation('androidx.test:rules:1.4.0')
testImplementation 'junit:junit:4.12'
implementation 'androidx.test.ext:junit:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.google.android.material:material:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'com.google.code.gson:gson:2.8.1'
implementation (name: 'highcharts-release', ext: 'aar', group: "com.highsoft.highcharts", version: "11.4.5")
}

Binary file modified Example/HighFit/app/libs/highcharts-release.aar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package com.highsoft.highfit;

import static org.junit.Assert.assertEquals;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;

import androidx.test.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
2 changes: 1 addition & 1 deletion Example/HighFit/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="com.highsoft.highfit.FileProvider"
android:exported="false"
android:grantUriPermissions="true">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.app.FragmentManager;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.widget.DrawerLayout;
import androidx.drawerlayout.widget.DrawerLayout;


public class MainActivity extends Activity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import android.content.res.Configuration;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v4.app.ActionBarDrawerToggle;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import android.view.*;
import android.widget.*;

Expand Down Expand Up @@ -133,7 +133,6 @@ public void setUp(int fragmentId, DrawerLayout drawerLayout) {
mDrawerToggle = new ActionBarDrawerToggle(
getActivity(), /* host Activity */
mDrawerLayout, /* DrawerLayout object */
R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */
R.string.navigation_drawer_open, /* "open drawer" description for accessibility */
R.string.navigation_drawer_close /* "close drawer" description for accessibility */
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
<android.support.v4.widget.DrawerLayout
<androidx.drawerlayout.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
Expand All @@ -24,4 +24,4 @@
android:name="com.highsoft.highfit.NavigationDrawerFragment"
tools:layout="@layout/drawer_dashboard"/>

</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>
2 changes: 1 addition & 1 deletion Example/HighFit/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20"
// NOTE: Do not place your application dependencies here; they belong
Expand Down
1 change: 1 addition & 0 deletions Example/HighFit/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
2 changes: 1 addition & 1 deletion Example/HighFit/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Apr 09 15:28:03 CEST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ repositories {
and following to the dependencies in your app **build.gradle** file:
```gradle
dependencies {
implementation 'com.github.highcharts:highcharts-android:11.4.3'
implementation 'com.github.highcharts:highcharts-android:11.4.5'
}
```
**B)** You can download the _aar_ from [here](https://github.com/highcharts/highcharts-android/releases) and add it manually if you want. Put the _aar_ in the _libs_ folder in your project structure:
Expand Down
Binary file modified highcharts-android.aar
Binary file not shown.
2 changes: 1 addition & 1 deletion jitpack.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
install:
- FILE="-Dfile=highcharts-android.aar"
- mvn install:install-file $FILE -DgroupId=com.github.highcharts -DartifactId=highcharts-android -Dversion=11.4.3 -Dpackaging=aar -DgeneratePom=true
- mvn install:install-file $FILE -DgroupId=com.github.highcharts -DartifactId=highcharts-android -Dversion=11.4.5 -Dpackaging=aar -DgeneratePom=true
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.highcharts</groupId>
<artifactId>highcharts-android</artifactId>
<version>11.4.3</version>
<version>11.4.5</version>
</project>

0 comments on commit 215f1e4

Please sign in to comment.