Skip to content

Commit

Permalink
Upgrade dependencies, including fred and bookmarks (#120)
Browse files Browse the repository at this point in the history
* Upgrade dependencies, including fred and bookmarks
* Update java build version
  • Loading branch information
desyncr authored Jul 4, 2022
1 parent a9723be commit 3168919
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 49 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: set up JDK 1.8
- name: set up JDK
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- name: Install NDK
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT}
- name: Build with Gradle
Expand Down
40 changes: 20 additions & 20 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 30
buildToolsVersion "30.0.0"
compileSdkVersion 32
buildToolsVersion "30.0.3"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
defaultConfig {
applicationId "org.freenetproject.mobile"
minSdkVersion 22
targetSdkVersion 30
versionCode 307
versionName '0.3.6-beta'
targetSdkVersion 32
versionCode 308
versionName '0.3.7-beta'

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
Expand All @@ -32,44 +32,44 @@ android {
}

repositories {
jcenter()
mavenCentral()
maven { url 'https://jitpack.io' }
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.navigation:navigation-fragment:2.3.5'
implementation 'androidx.navigation:navigation-ui:2.3.5'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.navigation:navigation-fragment:2.5.0'
implementation 'androidx.navigation:navigation-ui:2.5.0'
implementation 'com.android.support:multidex:1.0.3'

// ViewModel
implementation "androidx.lifecycle:lifecycle-viewmodel:2.3.1"
implementation "androidx.lifecycle:lifecycle-viewmodel:2.5.0"
// LiveData
implementation "androidx.lifecycle:lifecycle-livedata:2.3.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1"
implementation "androidx.lifecycle:lifecycle-livedata:2.5.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.0"

implementation 'com.jakewharton:process-phoenix:2.0.0'
implementation 'com.google.guava:guava:24.1-jre'
implementation 'com.google.guava:guava:30.0-android'

// Freenet dependencies
implementation ('com.github.freenet-mobile:node-wrapper:0.11') {
implementation ('com.github.freenet-mobile:node-wrapper:0.12') {
exclude group: 'org.freenetproject', module: 'freenet-ext'
exclude group: 'net.java.dev.jna', module: 'jna'
exclude group: 'net.java.dev.jna', module: 'jna-platform'
}
implementation 'net.java.dev.jna:jna:4.5.2@aar'
implementation 'net.java.dev.jna:jna:5.6.0@aar'
// End Freenet dependencies

// For running a locally built freenet.jar
//implementation "net.java.dev.jna:jna:4.5.2"
//implementation "net.java.dev.jna:jna-platform:4.5.2"
//implementation files('libs/freenet.jar')

implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.preference:preference:1.2.0'

testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}
7 changes: 4 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
tools:ignore="ScopedStorage" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

Expand Down Expand Up @@ -49,8 +50,8 @@

<activity
android:name=".ui.main.activity.MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
android:theme="@style/AppTheme.NoActionBar"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
61 changes: 43 additions & 18 deletions app/src/main/res/raw/bookmarks.dat
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@ Version=1
Bookmark=0
BookmarkCategory0.Name=L10N:categoryIndexes
BookmarkCategory0.Content.BookmarkCategory=0
BookmarkCategory0.Content.Bookmark=4
BookmarkCategory0.Content.Bookmark0.Name=The Filtered Index
BookmarkCategory0.Content.Bookmark0.ShortDescription=L10N:TheFilteredIndex
BookmarkCategory0.Content.Bookmark0.Description=L10N:TheFilteredIndex
BookmarkCategory0.Content.Bookmark=2
BookmarkCategory0.Content.Bookmark0.Name=Clean Spider
BookmarkCategory0.Content.Bookmark0.Description=L10N:CleanSpider
BookmarkCategory0.Content.Bookmark0.ShortDescription=L10N:CleanSpider
BookmarkCategory0.Content.Bookmark0.hasAnActivelink=true
BookmarkCategory0.Content.Bookmark0.URI=USK@ozMQYaCEXnlHQQggITYSIeNSxqdMknqjOIYyCdMKqJA,gJyID9FRxaM5zDql3D8-wHACAusOYa5Aag3M4tSEt~g,AQACAAE/Index/1220/
BookmarkCategory0.Content.Bookmark0.URI=USK@5ijbfKSJ4kPZTRDzq363CHteEUiSZjrO-E36vbHvnIU,ZEZqPXeuYiyokY2r0wkhJr5cy7KBH9omkuWDqSC6PLs,AQACAAE/clean-spider/70/
BookmarkCategory0.Content.Bookmark1.Name=JFniki Index
BookmarkCategory0.Content.Bookmark1.ShortDescription=L10N:JFnikiIndex
BookmarkCategory0.Content.Bookmark1.Description=L10N:JFnikiIndex
BookmarkCategory0.Content.Bookmark1.hasAnActivelink=true
BookmarkCategory0.Content.Bookmark1.URI=USK@z6lnOx7PPe16P3Sobu1KM9jiLiIxdvE3L918QMVCLak,AmZ7RemmWcKM2-W4Zs38Ks511lRTsWleMj2mVAReB4E,AQACAAE/jFniki.Index/8/
BookmarkCategory1.Name=L10N:categoryDocumentation
BookmarkCategory1.Content.BookmarkCategory=0
BookmarkCategory1.Content.Bookmark=8
BookmarkCategory1.Content.Bookmark0.URI=USK@0iU87PXyodL2nm6kCpmYntsteViIbMwlJE~wlqIVvZ0,nenxGvjXDElX5RIZxMvwSnOtRzUKJYjoXEDgkhY6Ljw,AQACAAE/freenetproject-mirror/511/
BookmarkCategory1.Content.Bookmark=10
BookmarkCategory1.Content.Bookmark0.URI=USK@0iU87PXyodL2nm6kCpmYntsteViIbMwlJE~wlqIVvZ0,nenxGvjXDElX5RIZxMvwSnOtRzUKJYjoXEDgkhY6Ljw,AQACAAE/freenetproject-mirror/515/
BookmarkCategory1.Content.Bookmark0.Name=Freenetproject Website Mirror
BookmarkCategory1.Content.Bookmark0.Description=L10N:freenetprojectorg
BookmarkCategory1.Content.Bookmark0.ShortDescription=L10N:freenetprojectorg
Expand Down Expand Up @@ -47,14 +52,24 @@ BookmarkCategory1.Content.Bookmark6.hasAnActivelink=true
BookmarkCategory1.Content.Bookmark6.Name=The Unofficial FMS Guide
BookmarkCategory1.Content.Bookmark6.Description=L10N:unofficialfmsguide
BookmarkCategory1.Content.Bookmark6.ShortDescription=L10N:unofficialfmsguide
BookmarkCategory1.Content.Bookmark7.URI=USK@WMa1Z40iYdZZ51yctQ3toFl9zuuFEnNdsm3NejJU5KE,jCBcaNBeKD5~sSQeSkyKz737Bh5ibBGqdzfD8mgfdMY,AQACAAE/statistics/793/
BookmarkCategory1.Content.Bookmark7.URI=USK@WMa1Z40iYdZZ51yctQ3toFl9zuuFEnNdsm3NejJU5KE,jCBcaNBeKD5~sSQeSkyKz737Bh5ibBGqdzfD8mgfdMY,AQACAAE/statistics/802/
BookmarkCategory1.Content.Bookmark7.hasAnActivelink=true
BookmarkCategory1.Content.Bookmark7.Name=Freenet Statistics
BookmarkCategory1.Content.Bookmark7.Description=L10N:statistics
BookmarkCategory1.Content.Bookmark7.ShortDescription=L10N:statistics
BookmarkCategory1.Content.Bookmark8.URI=USK@lwR9sLnZD3QHveZa1FB0dAHgeck~dFNBg368mY09wSU,0Vq~4FXSUj1-op3QdzqjZsIvrNMYWlnSdUwCl-Z1fYA,AQACAAE/fetchpullstats/579/
BookmarkCategory1.Content.Bookmark8.hasAnActivelink=true
BookmarkCategory1.Content.Bookmark8.Name=Fetch-pull stats
BookmarkCategory1.Content.Bookmark8.Description=L10N:fetchpull
BookmarkCategory1.Content.Bookmark8.ShortDescription=L10N:fetchpull
BookmarkCategory1.Content.Bookmark9.URI=USK@~hA9BG8IXEdc3TJhim9ETgvBeGf72pXt-y7AaG9MN4A,P2u8RJ~YxMUWOVS1JStqCGTRq78vlVbaQCCKVvxTZP0,AQACAAE/sharesitedoc/4/
BookmarkCategory1.Content.Bookmark9.hasAnActivelink=true
BookmarkCategory1.Content.Bookmark9.Name=Sharesite Documentation
BookmarkCategory1.Content.Bookmark9.Description=L10N:sharesitedocumentation
BookmarkCategory1.Content.Bookmark9.ShortDescription=L10N:sharesitedocumentation
BookmarkCategory2.Name=L10N:categorySoftware
BookmarkCategory2.Content.BookmarkCategory=0
BookmarkCategory2.Content.Bookmark=4
BookmarkCategory2.Content.Bookmark=6
BookmarkCategory2.Content.Bookmark0.Name=Freenet Message System
BookmarkCategory2.Content.Bookmark0.Description=L10N:FMS
BookmarkCategory2.Content.Bookmark0.ShortDescription=L10N:FMS
Expand All @@ -75,14 +90,24 @@ BookmarkCategory2.Content.Bookmark3.Name=jSite
BookmarkCategory2.Content.Bookmark3.Description=L10N:jSite
BookmarkCategory2.Content.Bookmark3.ShortDescription=L10N:jSite
BookmarkCategory2.Content.Bookmark3.hasAnActivelink=true
BookmarkCategory2.Content.Bookmark4.URI=USK@MYLAnId-ZEyXhDGGbYOa1gOtkZZrFNTXjFl1dibLj9E,Xpu27DoAKKc8b0718E-ZteFrGqCYROe7XBBJI57pB4M,AQACAAE/Shoeshop/3/
BookmarkCategory2.Content.Bookmark4.Name=Shoeshop
BookmarkCategory2.Content.Bookmark4.Description=L10N:Shoeshhop
BookmarkCategory2.Content.Bookmark4.ShortDescription=L10N:Shoeshop
BookmarkCategory2.Content.Bookmark4.hasAnActivelink=true
BookmarkCategory2.Content.Bookmark5.URI=USK@pGQPA-9PcFiE3A2tCuCjacK165UaX07AQYw98iDQrNA,8gwQ67ytBNR03hNj7JU~ceeew22HVq6G50dcEeMcgks,AQACAAE/flip/17/
BookmarkCategory2.Content.Bookmark5.Name=FLIP
BookmarkCategory2.Content.Bookmark5.Description=L10N:FLIP
BookmarkCategory2.Content.Bookmark5.ShortDescription=L10N:FLIP
BookmarkCategory2.Content.Bookmark5.hasAnActivelink=true
BookmarkCategory3.Name=L10N:categoryBlogs
BookmarkCategory3.Content.BookmarkCategory=0
BookmarkCategory3.Content.Bookmark=5
BookmarkCategory3.Content.Bookmark0.Name=Toad
BookmarkCategory3.Content.Bookmark0.Description=L10N:Flog.Toad
BookmarkCategory3.Content.Bookmark0.ShortDescription=L10N:Flog.Toad
BookmarkCategory3.Content.Bookmark0.Name=ArneBab
BookmarkCategory3.Content.Bookmark0.Description=L10N:Flog.ArneBab
BookmarkCategory3.Content.Bookmark0.ShortDescription=L10N:Flog.ArneBab
BookmarkCategory3.Content.Bookmark0.hasAnActivelink=true
BookmarkCategory3.Content.Bookmark0.URI=USK@yGvITGZzrY1vUZK-4AaYLgcjZ7ysRqNTMfdcO8gS-LY,-ab5bJVD3Lp-LXEQqBAhJpMKrKJ19RnNaZMIkusU79s,AQACAAE/toad/56/
BookmarkCategory3.Content.Bookmark0.URI=USK@sUm3oJISSEU4pl2Is9qa1eRoCLyz6r2LPkEqlXc3~oc,yBEbf-IJrcB8Pe~gAd53DEEHgbugUkFSHtzzLqnYlbs,AQACAAE/random_babcom/450/
BookmarkCategory3.Content.Bookmark1.Name=Bombe
BookmarkCategory3.Content.Bookmark1.Description=L10N:Flog.Bombe
BookmarkCategory3.Content.Bookmark1.ShortDescription=L10N:Flog.Bombe
Expand All @@ -92,15 +117,15 @@ BookmarkCategory3.Content.Bookmark2.Name=xor
BookmarkCategory3.Content.Bookmark2.Description=L10N:Flog.Xor
BookmarkCategory3.Content.Bookmark2.ShortDescription=L10N:Flog.Xor
BookmarkCategory3.Content.Bookmark2.hasAnActivelink=true
BookmarkCategory3.Content.Bookmark2.URI=USK@QeTBVWTwBldfI-lrF~xf0nqFVDdQoSUghT~PvhyJ1NE,OjEywGD063La2H-IihD7iYtZm3rC0BP6UTvvwyF5Zh4,AQACAAE/flog/31/
BookmarkCategory3.Content.Bookmark2.URI=USK@QeTBVWTwBldfI-lrF~xf0nqFVDdQoSUghT~PvhyJ1NE,OjEywGD063La2H-IihD7iYtZm3rC0BP6UTvvwyF5Zh4,AQACAAE/flog/32/
BookmarkCategory3.Content.Bookmark3.Name=operhiem1
BookmarkCategory3.Content.Bookmark3.Description=L10N:Flog.Operhiem1
BookmarkCategory3.Content.Bookmark3.ShortDescription=L10N:Flog.Operhiem1
BookmarkCategory3.Content.Bookmark3.hasAnActivelink=true
BookmarkCategory3.Content.Bookmark3.URI=USK@pxtehd-TmfJwyNUAW2Clk4pwv7Nshyg21NNfXcqzFv4,LTjcTWqvsq3ju6pMGe9Cqb3scvQgECG81hRdgj5WO4s,AQACAAE/blog/35/
BookmarkCategory3.Content.Bookmark4.Name=ArneBab
BookmarkCategory3.Content.Bookmark4.Description=L10N:Flog.ArneBab
BookmarkCategory3.Content.Bookmark4.ShortDescription=L10N:Flog.ArneBab
BookmarkCategory3.Content.Bookmark4.Name=Toad
BookmarkCategory3.Content.Bookmark4.Description=L10N:Flog.Toad
BookmarkCategory3.Content.Bookmark4.ShortDescription=L10N:Flog.Toad
BookmarkCategory3.Content.Bookmark4.hasAnActivelink=true
BookmarkCategory3.Content.Bookmark4.URI=USK@sUm3oJISSEU4pl2Is9qa1eRoCLyz6r2LPkEqlXc3~oc,yBEbf-IJrcB8Pe~gAd53DEEHgbugUkFSHtzzLqnYlbs,AQACAAE/random_babcom/424/
BookmarkCategory3.Content.Bookmark4.URI=USK@yGvITGZzrY1vUZK-4AaYLgcjZ7ysRqNTMfdcO8gS-LY,-ab5bJVD3Lp-LXEQqBAhJpMKrKJ19RnNaZMIkusU79s,AQACAAE/toad/56/
End
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.android.tools.build:gradle:7.2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -15,7 +15,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Jan 24 17:29:48 GMT 2021
#Mon Jul 04 00:02:16 IST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME

0 comments on commit 3168919

Please sign in to comment.