diff --git a/hyperroid/app/build.gradle b/hyperroid/app/build.gradle index 60d038c4..617c158d 100644 --- a/hyperroid/app/build.gradle +++ b/hyperroid/app/build.gradle @@ -1,13 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 - buildToolsVersion "33.0.0" + namespace 'com.roguetemple.hyperroid' + compileSdkVersion 35 + buildToolsVersion "35.0.0" defaultConfig { applicationId "com.roguetemple.hyperroid" - minSdkVersion 18 - targetSdkVersion 33 + minSdkVersion 21 + targetSdkVersion 35 // multiDexEnabled true //javaMaxHeapSize "4g" @@ -88,8 +89,9 @@ dependencies { // // IDE setting pulls in the specific version of v4 support you have installed: // - implementation 'com.android.support:support-v4:28.0.0' + // implementation 'com.android.support:support-v4:28.0.0' + implementation 'androidx.core:core:1.7.0' // // generic directive pulls in any available version of v4 support: // diff --git a/hyperroid/app/src/main/AndroidManifest.xml b/hyperroid/app/src/main/AndroidManifest.xml index 3cbb90a8..9538b0ce 100644 --- a/hyperroid/app/src/main/AndroidManifest.xml +++ b/hyperroid/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ diff --git a/hyperroid/app/src/main/java/com/android/texample/GLText.java b/hyperroid/app/src/main/java/com/android/texample/GLText.java index 3903df30..47245d05 100644 --- a/hyperroid/app/src/main/java/com/android/texample/GLText.java +++ b/hyperroid/app/src/main/java/com/android/texample/GLText.java @@ -36,7 +36,7 @@ public class GLText { allchars = new StringBuffer(); for(char c=32; c<=126; c++) allchars.append(c); - allchars.append("°²´½ÁÄÇÈÉÍÎÖÚÜßàáâãäçèéêìíîïòóôõöøùúüýąćČčĎďĘęĚěğİıŁłńňŘřŚśŞşŠšŤťůŹźŻżŽžΘδλπϕЁАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёᵈ←→∞⌫⏎"); + allchars.append("¨°²´½ÀÁÄÇÈÉÊÍÎÖÚÜßàáâãäçèéêìíîïòóôõöøùúûüýĄąćČčĎďĘęĚěğİıŁłńňŒœŘřŚśŞşŠšŤťůŹźŻżŽžΘδλπϕЁАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёᵈᶻ—’“”…⁻←→√∞⌫⏎、。一丁七万三上下不与专且世丘业丛东丢两严个中临为主丽举乃久么义之乌乍乎乐乘乞也习乡乱了予争事二于亏云互五亚些亡交亦产享京亮亲人什仅仆仇今介仍从他付仙代令以们仰件价任份仿伊伏伐休优伙会传伤伪估伴伸似但位低住体何余作你佩佳使例供依侠侣侧侵便俊俏俑俗保信修俯倍倒候借值倾假偏做停健偶偷储像僧僵儿允元充先光克免入全八公六共关兴兵其具典兼兽内再冒军冠冬冰冲决况冷冻净准凉凌减几凡凤凰凶凸凹出击函刀刃分切划列则创初删利别到制刷刺刻前剑剥剩剪副割力劝办功加务劣动助劫励劳势勒包匕化北匙匠匪匹区十千升午半单南博占卡卫危即却卷厅历压厚原去参又叉及友双反发取受变叙叠口古句另只叫召可台史右叶号吃各合同名后吐向吓吗吞否吧含听启吱吸吹吻吼呀呃呆呈告员呢周味呼命和咒咬品哇响哎哦哪唉唤唯啃商啊善喜喝喷嗯嘘嘟嘲器囊囔四回因团园困围固国图圆圈土圣在地场均坍坏坐坑块坚坛坟坠坡坦垂型垫埃埋城域基堆堡堵塌塔填境墓墙增墟墨壁士声壳处备复外多夜够大天太夫央失头夹夺奇契奔奖套女她好如妖妙妹姆姊始姿威婆婪子字存孤学孩孵宁它宇守安完官宙定宝实宠客宣室宫害家容宽寂密富寒寝察寸对寻导寿封射将尊小少尔尖尝尤就尸尺尼尽尾局层居屏展属屠山屹屿岛岩岸峡崩崽嵌巢工左巧巨巫差己已巴市布帅师希帕帝带帧帮常帽幅幕干平年并幸幻幼幽广庆序库应底庞废度座康延建开异弃弄弊式弓引张弦弧弩弯弱弹强归当录形彩彭影彼往征径待很律徒得御微德心必忆忍忘快念忽怀态怎怒怕怜思急性怪总恋恐恒恢恨恩恭息恰恶恼悬悲情惊惑惜惧惩惯想惹愈愉意愚感愤愿慎慕慢慧憎懂戈戏成我或战截戳戴户所扁扇手才扎扑打扔托执扩扫扭扰找技抉把抓投抗折抛护报抬抵押抽担拉拓拔拖招拜拟拥拦拨择括拯拱拼拿持指按挑挖挡挥挪振捅捕损捡换捧据捶捷掉掌排掘掠探接控推掩掷描提握揭搁搅搜搞摇摧摸撇撑撞撤播擅操擎擦攀支收改攻放故效敌敏救教敢散敬数敲整文斐斑斗料斜斥斩断斯新方施旁旅旋族无既日旦旧早时昂昆明易星映春是显晕普景晶智暂暗暴曲更曾替最月有朋服望朝期木未末本术朵机杀杂杆杈李材束条来杯松板极构林枚果枝枪架枷柄某染柜查柱标栏树株样核根格框案桌档桥桩桶梁梅梦梭梯检棋棒棕棘森棵植椭楚楼概榜榴槛模横次欢欧款歇止正此步武死殆殊残殖段殿毁母每毒比毕毙毛毫毯民气水永求汇汞池汲汽沃沉沌沙没河油治沿泄泊法泡波注泳洋洗洛洞活流浅浆测浏浪浮海涂消涉涌涡涨液深混淹添清渊渐渔渗渡温港渲游湖湾湿溃源溶溺滑滚满滤滩漂演漠漩漫潜潮激灌火灭灯灰灵灼炎炫炸点炼烁烂烈烦烧烫热焦焰然照熄熔熟燃燥爆爪爬爱片版牙牛牢物牲特牺犬状狂狐狗狩独狭狱狼猎猛猜猫猬猿率王玛玩玫环现玻珀珊珍珠球理琥瑙瑚瑰璃瓜瓣瓶甚甜生用甩由甲电男画畅界留略疆疏疑疫疲瘟登白百的皇皮盈盏监盒盔盖盗盘盟目盯盲直相盾省看真眠眩眼着睛睡瞄瞥瞳矢知矩短石矿码砂砍研破砸础硕硫硬确碍碎碟碰磺示礼祝神祭禁离种科秒秘秩积称移稀程稍稔稳穴究穷空穿窃窄窒窗窝立竖站竞竟竭端笑笔符第笼等筑策简算管箭篝米类粒粗粘粹精糖糟系素索紧紫繁纠红纤约级纪纬纯纷纸纹线练组细终绍经绑结绕绘给绝统继绩续维绵绿缓编缘缚缝缟缤缩缺网罗罚罢罩置美群羽翁翻耀老考者而耍耐耗耶耸聊职聪肆股肤肫肯胁背胖胜胞能脆脉脑脚脱腐腾腿自至致舌舍舞舟航般船艇艘艰色艺节花苏苗若苦英苹茂范茹荆草荐荒荡荣药荷莫莱莲获莽菊菜菱营落著葬蒸蓝蔓蕨藏藤虎虐虑虚虫虹虻虽蚁蚂蛇蛋蛙蜂蜜蜥蜴蝙蝠蝴蝶螂融螺蟑蠕蠢血行衍衡衣表被袭裁裂装裔裹西要覆见观规视览觉觊觎角解触言誓警计认讨让训记许论讽设访证诅识诉译试话诠诡该详语误诱说请诺读谁调谅谈谊谐谓谜谢谷象貌贝负财败货质贪贴贵贸费贺贼资赋赏赖赛赢赤走起超越趣足跃跌跑跖距跟跨路跳踩踪身躯躲车转轮轴轻较辐辑输辨边达迅过迎运近返还这进远违连迟迫迭述迷迹追退送适逃逆选透逐途逗通速造逼遇遍道遗遥遭遵避那邪邻部都配酒酷酸酿醒采释里重野量金鉴针钓钥钩钮钱钻铀铁铜铠铭银铺销锁错锥键锯镇镜镶长门闪闭问闲间闵闹闻阅阈阔队阱防阳阴阵阶阻阿附际陆降限除陨险陪陵陷随隐隔隙障难雀雁雄集雉雏雕雪雷雾需霆震霉霓霜露青静非靠面革韧音页顶项顺须预领频颗题颜额风飞食餮饕饥饮饰饱馈首香马驯驱驶驻驾验骑骗骨骰骷骸髅高鬼魂魔鱼鲁鲜鲨鳞鸟鸡鸣鸥鸦鸽鹉鹦鹰麻黄黏黑默鼓鼠齐齿龙龟！（），：；？�"); } int numChars() { @@ -193,6 +193,7 @@ public class GLText { textureSize = 1024; // Set 1024 Texture Size else // ELSE IF Max Size is Larger Than 80 (and Less than FONT_SIZE_MAX) textureSize = 2048; // Set 2048 Texture Size + textureSize = 4096; /* needed for Chinese */ // create an empty bitmap (alpha only) Bitmap bitmap = Bitmap.createBitmap( textureSize, textureSize, Bitmap.Config.ARGB_8888 ); // Create Bitmap diff --git a/hyperroid/app/src/main/java/com/roguetemple/hyperroid/ForegroundService.java b/hyperroid/app/src/main/java/com/roguetemple/hyperroid/ForegroundService.java index 148c7322..87d24d9a 100644 --- a/hyperroid/app/src/main/java/com/roguetemple/hyperroid/ForegroundService.java +++ b/hyperroid/app/src/main/java/com/roguetemple/hyperroid/ForegroundService.java @@ -10,7 +10,7 @@ import android.graphics.BitmapFactory; import android.graphics.Color; import android.os.Build; import android.os.IBinder; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import android.util.Log; import android.widget.Toast; diff --git a/hyperroid/app/src/main/jni/hyper.cpp b/hyperroid/app/src/main/jni/hyper.cpp index 52bd2062..c988de58 100644 --- a/hyperroid/app/src/main/jni/hyper.cpp +++ b/hyperroid/app/src/main/jni/hyper.cpp @@ -428,9 +428,9 @@ void uploadAll(JNIEnv *env, jobject thiz) { env->DeleteLocalRef(cls); } -void achievement_init() {} -void achievement_close() {} -void achievement_gain(const char* s, char flags) {} +// void achievement_init() {} +// void achievement_close() {} +// void achievement_gain(const char* s, char flags) {} } diff --git a/hyperroid/build.gradle b/hyperroid/build.gradle index 310a056e..1ecc08de 100644 --- a/hyperroid/build.gradle +++ b/hyperroid/build.gradle @@ -1,23 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } - } - dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' - } -} - -allprojects { - repositories { - jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } - } -} +plugins { +alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.compose) apply false +} \ No newline at end of file diff --git a/hyperroid/gradle.properties b/hyperroid/gradle.properties new file mode 100644 index 00000000..5bac8ac5 --- /dev/null +++ b/hyperroid/gradle.properties @@ -0,0 +1 @@ +android.useAndroidX=true diff --git a/hyperroid/gradle/libs.versions.toml b/hyperroid/gradle/libs.versions.toml new file mode 100644 index 00000000..a1a05919 --- /dev/null +++ b/hyperroid/gradle/libs.versions.toml @@ -0,0 +1,32 @@ +[versions] +agp = "8.7.1" +kotlin = "2.0.0" +coreKtx = "1.10.1" +junit = "4.13.2" +junitVersion = "1.1.5" +espressoCore = "3.5.1" +lifecycleRuntimeKtx = "2.6.1" +activityCompose = "1.8.0" +composeBom = "2024.04.01" + +[libraries] +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } + diff --git a/hyperroid/gradle/wrapper/gradle-wrapper.properties b/hyperroid/gradle/wrapper/gradle-wrapper.properties index 41979d7a..008d34fc 100644 --- a/hyperroid/gradle/wrapper/gradle-wrapper.properties +++ b/hyperroid/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Feb 09 18:36:08 CET 2017 +#Fri Nov 01 15:10:34 CET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip diff --git a/hyperroid/settings.gradle b/hyperroid/settings.gradle index e7b4def4..d1c96e96 100644 --- a/hyperroid/settings.gradle +++ b/hyperroid/settings.gradle @@ -1 +1,23 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "HyperRogue" include ':app'